From: Jaka K. <lyn...@us...> - 2011-08-27 13:47:36
|
gemrb: Infinity Engine emulator The branch master has been updated via 0f0037a9347080f5c55294c160e54ea2b1f6318c (commit) via 34b59bae150a927617ecfe957427a2ea2169929c (commit) Summary of changes: gemrb/GUIScripts/GUICommon.py | 1 - gemrb/GUIScripts/GUIREC.py | 4 +--- gemrb/GUIScripts/bg2/GUICommonWindows.py | 2 +- gemrb/GUIScripts/iwd/GUIWORLD.py | 1 - gemrb/GUIScripts/iwd2/GUICommonWindows.py | 1 - gemrb/GUIScripts/iwd2/GUIWORLD.py | 2 -- gemrb/GUIScripts/pst/GUICommonWindows.py | 1 - gemrb/GUIScripts/pst/GUIWORLD.py | 1 - 8 files changed, 2 insertions(+), 11 deletions(-) from 2086318e0e513cacc4ab1d5e724974d6019b5f28 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=0f0037a9347080f5c55294c160e54ea2b1f6318c commit 0f0037a9347080f5c55294c160e54ea2b1f6318c Author: Jaka Kranjc <lyn...@us...> Date: Sat Aug 27 15:41:36 2011 +0200 removed various unused imports diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py index 3f9315c..24dd572 100644 --- a/gemrb/GUIScripts/GUICommon.py +++ b/gemrb/GUIScripts/GUICommon.py @@ -26,7 +26,6 @@ from ie_restype import RES_CHU, RES_2DA, RES_WMP, RES_ARE from ie_spells import LS_MEMO, LSR_KNOWN, LSR_LEVEL, LSR_STAT from GUIDefines import * from ie_stats import * -from ie_action import ACT_QSLOT1, ACT_QSLOT2, ACT_QSLOT3, ACT_QSLOT4, ACT_QSLOT5 from ie_slots import SLOT_ALL OtherWindowFn = None diff --git a/gemrb/GUIScripts/bg2/GUICommonWindows.py b/gemrb/GUIScripts/bg2/GUICommonWindows.py index 9524539..0f769b7 100644 --- a/gemrb/GUIScripts/bg2/GUICommonWindows.py +++ b/gemrb/GUIScripts/bg2/GUICommonWindows.py @@ -24,7 +24,7 @@ import GemRB from GUIDefines import * -from ie_stats import IE_MAXHITPOINTS, IE_STATE_ID, IE_HITPOINTS, STATE_DEAD +from ie_stats import IE_STATE_ID, STATE_DEAD from ie_modal import * from ie_action import * import GUICommon diff --git a/gemrb/GUIScripts/iwd/GUIWORLD.py b/gemrb/GUIScripts/iwd/GUIWORLD.py index 7b74a6d..d5276ab 100644 --- a/gemrb/GUIScripts/iwd/GUIWORLD.py +++ b/gemrb/GUIScripts/iwd/GUIWORLD.py @@ -27,7 +27,6 @@ from GUIDefines import * from ie_restype import * import GUICommon import GUICommonWindows -import GUIClasses import MessageWindow import CommonWindow diff --git a/gemrb/GUIScripts/iwd2/GUICommonWindows.py b/gemrb/GUIScripts/iwd2/GUICommonWindows.py index cd40539..529a442 100644 --- a/gemrb/GUIScripts/iwd2/GUICommonWindows.py +++ b/gemrb/GUIScripts/iwd2/GUICommonWindows.py @@ -37,7 +37,6 @@ import GUISPL import GUIREC import LUCommon import InventoryCommon -import LoadScreen FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 diff --git a/gemrb/GUIScripts/iwd2/GUIWORLD.py b/gemrb/GUIScripts/iwd2/GUIWORLD.py index 885b989..3fe0e1e 100644 --- a/gemrb/GUIScripts/iwd2/GUIWORLD.py +++ b/gemrb/GUIScripts/iwd2/GUIWORLD.py @@ -26,8 +26,6 @@ import GemRB from GUIDefines import * import GUICommon -from GUIClasses import GWindow -import GUICommonWindows import MessageWindow import CommonWindow diff --git a/gemrb/GUIScripts/pst/GUICommonWindows.py b/gemrb/GUIScripts/pst/GUICommonWindows.py index 8f1a2d8..49d5d82 100644 --- a/gemrb/GUIScripts/pst/GUICommonWindows.py +++ b/gemrb/GUIScripts/pst/GUICommonWindows.py @@ -39,7 +39,6 @@ import GUIINV import GUIOPT import GUIPR import GUIREC -import Maze FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 diff --git a/gemrb/GUIScripts/pst/GUIWORLD.py b/gemrb/GUIScripts/pst/GUIWORLD.py index 081b852..8c78f05 100644 --- a/gemrb/GUIScripts/pst/GUIWORLD.py +++ b/gemrb/GUIScripts/pst/GUIWORLD.py @@ -24,7 +24,6 @@ ################################################### import GemRB -import GUIClasses import GUICommon import GUICommonWindows import CommonWindow http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=34b59bae150a927617ecfe957427a2ea2169929c commit 34b59bae150a927617ecfe957427a2ea2169929c Author: Jaka Kranjc <lyn...@us...> Date: Sat Aug 27 15:33:54 2011 +0200 guirec: removed a now unused table diff --git a/gemrb/GUIScripts/GUIREC.py b/gemrb/GUIScripts/GUIREC.py index 45b2625..a511bd9 100644 --- a/gemrb/GUIScripts/GUIREC.py +++ b/gemrb/GUIScripts/GUIREC.py @@ -48,7 +48,6 @@ ExportWindow = None KitInfoWindow = None ExportDoneButton = None ExportFileName = "" -PortraitsTable = None ScriptsTable = None ColorTable = None ColorIndex = None @@ -1011,7 +1010,7 @@ def KitDonePress(): def OpenCustomizeWindow (): global CustomizeWindow - global PortraitsTable, ScriptsTable, ColorTable + global ScriptsTable, ColorTable pc = GemRB.GameGetSelectedPCSingle () if GemRB.GetPlayerStat (pc, IE_MC_FLAGS)&MC_EXPORTABLE: @@ -1019,7 +1018,6 @@ def OpenCustomizeWindow (): else: Exportable = 0 - PortraitsTable = GemRB.LoadTable ("PICTURES") ScriptsTable = GemRB.LoadTable ("SCRPDESC") ColorTable = GemRB.LoadTable ("CLOWNCOL") CustomizeWindow = GemRB.LoadWindow (17) ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |