Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. 8a9254dce46c499720c5435e3073139901e6953c
|
From: Jaka K. <lyn...@us...> - 2010-06-23 09:07:43
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 8a9254dce46c499720c5435e3073139901e6953c (commit)
via c1e481644c05c54e0c8acdc696b8bfebf232c323 (commit)
Summary of changes:
gemrb/GUIScripts/bg2/CharGen7.py | 1 -
gemrb/GUIScripts/bg2/CharGen8.py | 1 -
gemrb/GUIScripts/bg2/CharGen9.py | 1 -
gemrb/GUIScripts/bg2/GUICG1.py | 1 -
gemrb/GUIScripts/bg2/GUICommonWindows.py | 5 -----
gemrb/GUIScripts/bg2/GUISTORE.py | 6 +-----
gemrb/GUIScripts/bg2/GUIWORLD.py | 4 +---
gemrb/GUIScripts/iwd/CharGen.py | 22 +++++++++++-----------
gemrb/GUIScripts/iwd/GUICommonWindows.py | 4 ----
gemrb/GUIScripts/iwd/PartyFormation.py | 2 +-
10 files changed, 14 insertions(+), 33 deletions(-)
from bf2aee208d9ea3a2a7811a4f021251a9c963fc1b (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=8a9254dce46c499720c5435e3073139901e6953c
commit 8a9254dce46c499720c5435e3073139901e6953c
Author: Jaka Kranjc <lyn...@us...>
Date: Wed Jun 23 11:10:27 2010 +0200
iwd: fixed a few missed table lookups and one missing function
diff --git a/gemrb/GUIScripts/iwd/CharGen.py b/gemrb/GUIScripts/iwd/CharGen.py
index d75a168..888f7b2 100644
--- a/gemrb/GUIScripts/iwd/CharGen.py
+++ b/gemrb/GUIScripts/iwd/CharGen.py
@@ -435,7 +435,7 @@ def SetCharacterDescription():
KitIndex = GemRB.GetVar ("MAGESCHOOL")
if KitIndex == 0:
Class = GemRB.GetVar ("Class")-1
- ClassTitle=ClassTable.GetValue (Class, 2)
+ ClassTitle = GUICommon.ClassTable.GetValue (Class, 2)
else:
ClassTitle=KitTable.GetValue (KitIndex, 2)
TextArea.Append (ClassTitle)
@@ -443,7 +443,7 @@ def SetCharacterDescription():
if CharGenState > 1:
TextArea.Append (1048, -1)
TextArea.Append (": ")
- TextArea.Append (RaceTable.GetValue (GemRB.GetVar ("Race") - 1, 2) )
+ TextArea.Append (GUICommon.RaceTable.GetValue (GemRB.GetVar ("Race") - 1, 2) )
if CharGenState > 3:
TextArea.Append (1049, -1)
TextArea.Append (": ")
@@ -835,7 +835,7 @@ def RacePress():
RaceSelectButton = RaceWindow.GetControl (i)
RaceSelectButton.SetState (IE_GUI_BUTTON_ENABLED)
RaceSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, RaceSelectPress)
- RaceSelectButton.SetText (RaceTable.GetValue (i - 2, 0))
+ RaceSelectButton.SetText (GUICommon.RaceTable.GetValue (i - 2, 0))
RaceSelectButton.SetVarAssoc ("Race", i - 1)
RaceTextArea = RaceWindow.GetControl (8)
@@ -860,7 +860,7 @@ def RaceSelectPress():
global RaceWindow, RaceDoneButton, RaceTextArea
Race = GemRB.GetVar ("Race") - 1
- RaceTextArea.SetText (RaceTable.GetValue (Race, 1) )
+ RaceTextArea.SetText (GUICommon.RaceTable.GetValue (Race, 1) )
RaceDoneButton.SetState (IE_GUI_BUTTON_ENABLED)
return
@@ -907,7 +907,7 @@ def ClassPress():
HasMulti = 0
j = 2
for i in range (ClassCount):
- Allowed = GUICommon.ClassTable.GetValue (ClassTable.GetRowName (i), RaceName)
+ Allowed = GUICommon.ClassTable.GetValue (GUICommon.ClassTable.GetRowName (i), RaceName)
if GUICommon.ClassTable.GetValue (i, 4):
if Allowed != 0:
HasMulti = 1
@@ -919,7 +919,7 @@ def ClassPress():
else:
ClassSelectButton.SetState (IE_GUI_BUTTON_DISABLED)
ClassSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, ClassSelectPress)
- ClassSelectButton.SetText (ClassTable.GetValue (i, 0) )
+ ClassSelectButton.SetText (GUICommon.ClassTable.GetValue (i, 0) )
ClassSelectButton.SetVarAssoc ("Class", i + 1)
ClassMultiButton = ClassWindow.GetControl (10)
@@ -962,7 +962,7 @@ def ClassSelectPress():
global ClassWindow, ClassTextArea, ClassDoneButton
Class = GemRB.GetVar ("Class") - 1
- ClassTextArea.SetText (ClassTable.GetValue (Class, 1) )
+ ClassTextArea.SetText (GUICommon.ClassTable.GetValue (Class, 1) )
ClassDoneButton.SetState (IE_GUI_BUTTON_ENABLED)
return
@@ -981,15 +981,15 @@ def ClassMultiPress():
j = 2
for i in range (ClassCount):
ClassName = GUICommon.ClassTable.GetRowName (i)
- if (ClassTable.GetValue (ClassName, "MULTI") > 0):
+ if (GUICommon.ClassTable.GetValue (ClassName, "MULTI") > 0):
ClassMultiSelectButton = ClassMultiWindow.GetControl (j)
j = j + 1
- if (ClassTable.GetValue (ClassName, RaceName) > 0):
+ if (GUICommon.ClassTable.GetValue (ClassName, RaceName) > 0):
ClassMultiSelectButton.SetState (IE_GUI_BUTTON_ENABLED)
else:
ClassMultiSelectButton.SetState (IE_GUI_BUTTON_DISABLED)
ClassMultiSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, ClassMultiSelectPress)
- ClassMultiSelectButton.SetText (ClassTable.GetValue (i, 0) )
+ ClassMultiSelectButton.SetText (GUICommon.ClassTable.GetValue (i, 0) )
ClassMultiSelectButton.SetVarAssoc ("Class", i + 1)
ClassMultiTextArea = ClassMultiWindow.GetControl (12)
@@ -1014,7 +1014,7 @@ def ClassMultiSelectPress():
global ClassMultiWindow, ClassMultiTextArea, ClassMultiDoneButton
Class = GemRB.GetVar ("Class") - 1
- ClassMultiTextArea.SetText (ClassTable.GetValue (Class, 1) )
+ ClassMultiTextArea.SetText (GUICommon.ClassTable.GetValue (Class, 1) )
ClassMultiDoneButton.SetState (IE_GUI_BUTTON_ENABLED)
return
diff --git a/gemrb/GUIScripts/iwd/GUICommonWindows.py b/gemrb/GUIScripts/iwd/GUICommonWindows.py
index 86cb3e8..4513c42 100644
--- a/gemrb/GUIScripts/iwd/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd/GUICommonWindows.py
@@ -37,10 +37,6 @@ import GUIINV
import GUIOPT
import GUIPR
import GUIREC
-#import GUISTORE
-#import GUIWORLD
-#import TextScreen
-#import LevelUp
FRAME_PC_SELECTED = 0
FRAME_PC_TARGET = 1
diff --git a/gemrb/GUIScripts/iwd/PartyFormation.py b/gemrb/GUIScripts/iwd/PartyFormation.py
index b0b6d19..a6051e2 100644
--- a/gemrb/GUIScripts/iwd/PartyFormation.py
+++ b/gemrb/GUIScripts/iwd/PartyFormation.py
@@ -38,7 +38,7 @@ def OnLoad ():
PartyFormationWindow.SetFrame ()
ModifyCharsButton = PartyFormationWindow.GetControl (43)
- ModifyCharsButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, ModifyPress)
+ ModifyCharsButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, None) #TODO: ModifyPress
ModifyCharsButton.SetStatus (IE_GUI_BUTTON_DISABLED)
ModifyCharsButton.SetText (18816)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c1e481644c05c54e0c8acdc696b8bfebf232c323
commit c1e481644c05c54e0c8acdc696b8bfebf232c323
Author: Jaka Kranjc <lyn...@us...>
Date: Wed Jun 23 10:58:02 2010 +0200
bg2: removed a few unneeded imports
diff --git a/gemrb/GUIScripts/bg2/CharGen7.py b/gemrb/GUIScripts/bg2/CharGen7.py
index 04ecd97..d2ef7c4 100644
--- a/gemrb/GUIScripts/bg2/CharGen7.py
+++ b/gemrb/GUIScripts/bg2/CharGen7.py
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#character generation - skills/profs/spells; next apearance/sound (CharGen7)
-import GemRB
import CharGenCommon
def OnLoad():
diff --git a/gemrb/GUIScripts/bg2/CharGen8.py b/gemrb/GUIScripts/bg2/CharGen8.py
index c8d9ca5..b67dc2e 100644
--- a/gemrb/GUIScripts/bg2/CharGen8.py
+++ b/gemrb/GUIScripts/bg2/CharGen8.py
@@ -17,7 +17,6 @@
#
#
#character generation (GUICG 0)
-import GemRB
import CharGenCommon
def OnLoad():
diff --git a/gemrb/GUIScripts/bg2/CharGen9.py b/gemrb/GUIScripts/bg2/CharGen9.py
index 0f5c82d..a59568f 100644
--- a/gemrb/GUIScripts/bg2/CharGen9.py
+++ b/gemrb/GUIScripts/bg2/CharGen9.py
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# character generation (CharGen9.py)
-import GemRB
import CharGenCommon
def OnLoad():
diff --git a/gemrb/GUIScripts/bg2/GUICG1.py b/gemrb/GUIScripts/bg2/GUICG1.py
index f38e4a9..7721708 100644
--- a/gemrb/GUIScripts/bg2/GUICG1.py
+++ b/gemrb/GUIScripts/bg2/GUICG1.py
@@ -20,7 +20,6 @@
import GemRB
from ie_stats import *
from GUIDefines import *
-import GUICommon
GenderWindow = 0
TextAreaControl = 0
diff --git a/gemrb/GUIScripts/bg2/GUICommonWindows.py b/gemrb/GUIScripts/bg2/GUICommonWindows.py
index 52d65f3..6807327 100644
--- a/gemrb/GUIScripts/bg2/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg2/GUICommonWindows.py
@@ -38,11 +38,6 @@ import GUIINV
import GUIOPT
import GUIPR
import GUIREC
-import GUISTORE
-import GUIWORLD
-import TextScreen
-import LevelUp
-import DualClass
FRAME_PC_SELECTED = 0
FRAME_PC_TARGET = 1
diff --git a/gemrb/GUIScripts/bg2/GUISTORE.py b/gemrb/GUIScripts/bg2/GUISTORE.py
index 2933780..016f27a 100644
--- a/gemrb/GUIScripts/bg2/GUISTORE.py
+++ b/gemrb/GUIScripts/bg2/GUISTORE.py
@@ -24,6 +24,7 @@
import GemRB
import GUICommon
+import GUICommonWindows
from GUIDefines import *
from ie_stats import *
from ie_slots import *
@@ -86,7 +87,6 @@ def CloseWindows ():
return
def CloseStoreWindow ():
- import GUICommonWindows
import GUIINV
global StoreWindow, ActionWindow, PortraitWindow
global OldPortraitWindow
@@ -111,7 +111,6 @@ def CloseStoreWindow ():
return
def OpenStoreWindow ():
- import GUICommonWindows
global Store
global StoreWindow, ActionWindow, PortraitWindow
global OldPortraitWindow
@@ -181,7 +180,6 @@ def OpenStoreWindow ():
return
def OpenStoreShoppingWindow ():
- import GUICommonWindows
global StoreShoppingWindow
global LeftButton, RightButton
@@ -272,7 +270,6 @@ def OpenStoreShoppingWindow ():
return
def OpenStoreIdentifyWindow ():
- import GUICommonWindows
global StoreIdentifyWindow
GemRB.SetVar ("Index", -1)
@@ -352,7 +349,6 @@ def OpenStoreStealWindow ():
return
def OpenStoreDonateWindow ():
- import GUICommonWindows
global StoreDonateWindow
CloseWindows ()
diff --git a/gemrb/GUIScripts/bg2/GUIWORLD.py b/gemrb/GUIScripts/bg2/GUIWORLD.py
index 8a81a18..8f56395 100644
--- a/gemrb/GUIScripts/bg2/GUIWORLD.py
+++ b/gemrb/GUIScripts/bg2/GUIWORLD.py
@@ -25,6 +25,7 @@
import GemRB
from GUIDefines import *
import GUICommon
+import GUICommonWindows
import GUIClasses
FRAME_PC_SELECTED = 0
@@ -60,7 +61,6 @@ def NextDialogState ():
def OpenEndMessageWindow ():
- import GUICommonWindows
global ContinueWindow, OldActionsWindow
hideflag = GemRB.HideGUI ()
@@ -306,7 +306,6 @@ def TakeItemContainer ():
def UpdateReformWindow ():
- import GUICommonWindows
Window = ReformPartyWindow
select = GemRB.GetVar ("Selected")
@@ -397,7 +396,6 @@ def RemovePlayerCancel ():
return
def OpenReformPartyWindow ():
- import GUICommonWindows
global ReformPartyWindow, OldActionsWindow, OldMessageWindow
GemRB.SetVar ("Selected", 0)
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|