Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. 13979917a544d56ee12884c8fedf2c3a407c4fb4
|
From: Tom <rtp...@us...> - 2010-06-12 13:31:46
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 13979917a544d56ee12884c8fedf2c3a407c4fb4 (commit)
Summary of changes:
gemrb/GUIScripts/LUSpellSelection.py | 4 +-
gemrb/GUIScripts/LevelUp.py | 2 +-
gemrb/GUIScripts/TextScreen.py | 2 +-
gemrb/GUIScripts/bg1/CharGenCommon.py | 2 +-
gemrb/GUIScripts/bg1/GUICG1.py | 2 +-
gemrb/GUIScripts/bg1/GUICG10.py | 2 +-
gemrb/GUIScripts/bg1/GUICG12.py | 4 +-
gemrb/GUIScripts/bg1/GUICG13.py | 4 +-
gemrb/GUIScripts/bg1/GUICG15.py | 2 +-
gemrb/GUIScripts/bg1/GUICG19.py | 2 +-
gemrb/GUIScripts/bg1/GUICG2.py | 2 +-
gemrb/GUIScripts/bg1/GUICG22.py | 2 +-
gemrb/GUIScripts/bg1/GUICG3.py | 2 +-
gemrb/GUIScripts/bg1/GUICG4.py | 2 +-
gemrb/GUIScripts/bg1/GUICG5.py | 2 +-
gemrb/GUIScripts/bg1/GUICG6.py | 2 +-
gemrb/GUIScripts/bg1/GUICG8.py | 2 +-
gemrb/GUIScripts/bg1/GUICG9.py | 2 +-
gemrb/GUIScripts/bg1/GUICommonWindows.py | 4 +-
gemrb/GUIScripts/bg1/GUIINV.py | 12 +++---
gemrb/GUIScripts/bg1/GUIJRNL.py | 4 +-
gemrb/GUIScripts/bg1/GUILOAD.py | 4 +-
gemrb/GUIScripts/bg1/GUIMA.py | 10 +++---
gemrb/GUIScripts/bg1/GUIMG.py | 10 +++---
gemrb/GUIScripts/bg1/GUIMOVIE.py | 2 +-
gemrb/GUIScripts/bg1/GUIMP.py | 4 +-
gemrb/GUIScripts/bg1/GUIOPT.py | 20 ++++++------
gemrb/GUIScripts/bg1/GUIPR.py | 10 +++---
gemrb/GUIScripts/bg1/GUIREC.py | 26 +++++++-------
gemrb/GUIScripts/bg1/GUISAVE.py | 6 ++--
gemrb/GUIScripts/bg1/GUISTORE.py | 26 +++++++-------
gemrb/GUIScripts/bg1/GUIWORLD.py | 12 +++---
gemrb/GUIScripts/bg1/ImportFile.py | 2 +-
gemrb/GUIScripts/bg1/LoadScreen.py | 2 +-
gemrb/GUIScripts/bg1/MessageWindow.py | 10 +++---
gemrb/GUIScripts/bg1/Start.py | 4 +-
gemrb/GUIScripts/bg2/CharGenCommon.py | 2 +-
gemrb/GUIScripts/bg2/DualClass.py | 8 ++--
gemrb/GUIScripts/bg2/ExportFile.py | 2 +-
gemrb/GUIScripts/bg2/GUICG1.py | 4 +-
gemrb/GUIScripts/bg2/GUICG10.py | 2 +-
gemrb/GUIScripts/bg2/GUICG12.py | 4 +-
gemrb/GUIScripts/bg2/GUICG13.py | 4 +-
gemrb/GUIScripts/bg2/GUICG15.py | 2 +-
gemrb/GUIScripts/bg2/GUICG19.py | 2 +-
gemrb/GUIScripts/bg2/GUICG2.py | 2 +-
gemrb/GUIScripts/bg2/GUICG22.py | 2 +-
gemrb/GUIScripts/bg2/GUICG23.py | 2 +-
gemrb/GUIScripts/bg2/GUICG24.py | 2 +-
gemrb/GUIScripts/bg2/GUICG3.py | 2 +-
gemrb/GUIScripts/bg2/GUICG4.py | 2 +-
gemrb/GUIScripts/bg2/GUICG5.py | 2 +-
gemrb/GUIScripts/bg2/GUICG6.py | 2 +-
gemrb/GUIScripts/bg2/GUICG8.py | 2 +-
gemrb/GUIScripts/bg2/GUICG9.py | 2 +-
gemrb/GUIScripts/bg2/GUICommonWindows.py | 4 +-
gemrb/GUIScripts/bg2/GUIINV.py | 16 +++++-----
gemrb/GUIScripts/bg2/GUIJRNL.py | 4 +-
gemrb/GUIScripts/bg2/GUILOAD.py | 4 +-
gemrb/GUIScripts/bg2/GUIMA.py | 12 +++---
gemrb/GUIScripts/bg2/GUIMG.py | 14 ++++----
gemrb/GUIScripts/bg2/GUIMOVIE.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT.py | 20 ++++++------
gemrb/GUIScripts/bg2/GUIOPT10.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT12.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT6.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT7.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT8.py | 2 +-
gemrb/GUIScripts/bg2/GUIOPT9.py | 2 +-
gemrb/GUIScripts/bg2/GUIPR.py | 10 +++---
gemrb/GUIScripts/bg2/GUIREC.py | 28 ++++++++--------
gemrb/GUIScripts/bg2/GUISAVE.py | 6 ++--
gemrb/GUIScripts/bg2/GUISONGS.py | 2 +-
gemrb/GUIScripts/bg2/GUISTORE.py | 26 +++++++-------
gemrb/GUIScripts/bg2/GUIWORLD.py | 12 +++---
gemrb/GUIScripts/bg2/ImportFile.py | 2 +-
gemrb/GUIScripts/bg2/ImportGame.py | 2 +-
gemrb/GUIScripts/bg2/LUHLASelection.py | 2 +-
gemrb/GUIScripts/bg2/LoadScreen.py | 2 +-
gemrb/GUIScripts/bg2/MessageWindow.py | 10 +++---
gemrb/GUIScripts/bg2/Start.py | 2 +-
gemrb/GUIScripts/bg2/Start2.py | 6 ++--
gemrb/GUIScripts/bg2/StartOpt.py | 2 +-
gemrb/GUIScripts/iwd/CharGen.py | 44 +++++++++++++-------------
gemrb/GUIScripts/iwd/GUICommonWindows.py | 4 +-
gemrb/GUIScripts/iwd/GUIINV.py | 14 ++++----
gemrb/GUIScripts/iwd/GUIJRNL.py | 4 +-
gemrb/GUIScripts/iwd/GUILOAD.py | 4 +-
gemrb/GUIScripts/iwd/GUIMA.py | 10 +++---
gemrb/GUIScripts/iwd/GUIMG.py | 10 +++---
gemrb/GUIScripts/iwd/GUIMOVIE.py | 2 +-
gemrb/GUIScripts/iwd/GUIOPT.py | 20 ++++++------
gemrb/GUIScripts/iwd/GUIPR.py | 10 +++---
gemrb/GUIScripts/iwd/GUIREC.py | 26 +++++++-------
gemrb/GUIScripts/iwd/GUISAVE.py | 6 ++--
gemrb/GUIScripts/iwd/GUISTORE.py | 26 +++++++-------
gemrb/GUIScripts/iwd/GUIWORLD.py | 12 +++---
gemrb/GUIScripts/iwd/LoadScreen.py | 2 +-
gemrb/GUIScripts/iwd/MessageWindow.py | 12 +++---
gemrb/GUIScripts/iwd/PartyFormation.py | 6 ++--
gemrb/GUIScripts/iwd/Start.py | 10 +++---
gemrb/GUIScripts/iwd2/Abilities.py | 2 +-
gemrb/GUIScripts/iwd2/Alignment.py | 2 +-
gemrb/GUIScripts/iwd2/Appearance.py | 4 +-
gemrb/GUIScripts/iwd2/AutoPause.py | 2 +-
gemrb/GUIScripts/iwd2/CSound.py | 2 +-
gemrb/GUIScripts/iwd2/CharGen9.py | 2 +-
gemrb/GUIScripts/iwd2/CharOverview.py | 4 +-
gemrb/GUIScripts/iwd2/CharSound.py | 2 +-
gemrb/GUIScripts/iwd2/Class.py | 2 +-
gemrb/GUIScripts/iwd2/Enemy.py | 2 +-
gemrb/GUIScripts/iwd2/Feats.py | 2 +-
gemrb/GUIScripts/iwd2/Feedback.py | 2 +-
gemrb/GUIScripts/iwd2/GUICommonWindows.py | 2 +-
gemrb/GUIScripts/iwd2/GUIINV.py | 12 +++---
gemrb/GUIScripts/iwd2/GUIJRNL.py | 2 +-
gemrb/GUIScripts/iwd2/GUILOAD.py | 4 +-
gemrb/GUIScripts/iwd2/GUIMA.py | 14 ++++----
gemrb/GUIScripts/iwd2/GUIOPT.py | 22 ++++++------
gemrb/GUIScripts/iwd2/GUIREC.py | 10 +++---
gemrb/GUIScripts/iwd2/GUISAVE.py | 6 ++--
gemrb/GUIScripts/iwd2/GUISPL.py | 10 +++---
gemrb/GUIScripts/iwd2/GUISTORE.py | 26 +++++++-------
gemrb/GUIScripts/iwd2/GUIWORLD.py | 10 +++---
gemrb/GUIScripts/iwd2/GamePlay.py | 2 +-
gemrb/GUIScripts/iwd2/Gender.py | 4 +-
gemrb/GUIScripts/iwd2/Graphics.py | 2 +-
gemrb/GUIScripts/iwd2/ImportFile.py | 4 +-
gemrb/GUIScripts/iwd2/LoadScreen.py | 2 +-
gemrb/GUIScripts/iwd2/MessageWindow.py | 6 ++--
gemrb/GUIScripts/iwd2/Movies.py | 2 +-
gemrb/GUIScripts/iwd2/Name.py | 2 +-
gemrb/GUIScripts/iwd2/Options.py | 6 ++--
gemrb/GUIScripts/iwd2/Portrait.py | 4 +-
gemrb/GUIScripts/iwd2/Race.py | 2 +-
gemrb/GUIScripts/iwd2/SPParty.py | 2 +-
gemrb/GUIScripts/iwd2/SPPartyFormation.py | 4 +-
gemrb/GUIScripts/iwd2/Skills.py | 2 +-
gemrb/GUIScripts/iwd2/Songs.py | 2 +-
gemrb/GUIScripts/iwd2/Sound.py | 2 +-
gemrb/GUIScripts/iwd2/Start.py | 6 ++--
gemrb/GUIScripts/iwd2/SubRaces.py | 2 +-
gemrb/GUIScripts/pst/FloatMenuWindow.py | 2 +-
gemrb/GUIScripts/pst/GUICommonWindows.py | 14 ++++----
gemrb/GUIScripts/pst/GUIINV.py | 8 ++--
gemrb/GUIScripts/pst/GUIJRNL.py | 8 ++--
gemrb/GUIScripts/pst/GUILOAD.py | 4 +-
gemrb/GUIScripts/pst/GUIMA.py | 4 +-
gemrb/GUIScripts/pst/GUIMG.py | 6 ++--
gemrb/GUIScripts/pst/GUIOPT.py | 20 ++++++------
gemrb/GUIScripts/pst/GUIPR.py | 6 ++--
gemrb/GUIScripts/pst/GUIREC.py | 8 ++--
gemrb/GUIScripts/pst/GUISAVE.py | 6 ++--
gemrb/GUIScripts/pst/GUISTORE.py | 16 +++++-----
gemrb/GUIScripts/pst/GUIWORLD.py | 6 ++--
gemrb/GUIScripts/pst/LoadScreen.py | 2 +-
gemrb/GUIScripts/pst/MessageWindow.py | 6 ++--
gemrb/GUIScripts/pst/NewLife.py | 4 +-
gemrb/GUIScripts/pst/QuitGame.py | 2 +-
gemrb/GUIScripts/pst/Start.py | 4 +-
gemrb/docs/en/GUIScript/LoadWindow.txt | 2 +-
gemrb/docs/en/GUIScript/LoadWindowObject.txt | 12 -------
gemrb/plugins/GUIScript/GUIScript.cpp | 32 +------------------
163 files changed, 507 insertions(+), 549 deletions(-)
delete mode 100644 gemrb/docs/en/GUIScript/LoadWindowObject.txt
from fed8d0ccdaa50332f7ac4bb3f65ad98dbc11340e (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=13979917a544d56ee12884c8fedf2c3a407c4fb4
commit 13979917a544d56ee12884c8fedf2c3a407c4fb4
Author: Tom Prince <tom...@ua...>
Date: Sat Jun 12 09:09:12 2010 -0400
GUIScript: Rename LoadWindowObject => LoadWindow.
Use the new version of GUIScript::ConstructObject for this.
Signed-off-by: Tom Prince <tom...@ua...>
diff --git a/gemrb/GUIScripts/LUSpellSelection.py b/gemrb/GUIScripts/LUSpellSelection.py
index 26049f9..851be11 100644
--- a/gemrb/GUIScripts/LUSpellSelection.py
+++ b/gemrb/GUIScripts/LUSpellSelection.py
@@ -85,7 +85,7 @@ def OpenSpellsWindow (actor, table, level, diff, kit=0, gen=0, recommend=True):
# load our window
if chargen:
GemRB.LoadWindowPack("GUICG", 640, 480)
- SpellsWindow = GemRB.LoadWindowObject (7)
+ SpellsWindow = GemRB.LoadWindow (7)
if not recommend:
CloseOtherWindow (SpellsWindow.Unload)
DoneButton = SpellsWindow.GetControl (0)
@@ -113,7 +113,7 @@ def OpenSpellsWindow (actor, table, level, diff, kit=0, gen=0, recommend=True):
SpellsPickButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpellsPickPress")
SpellsPickButton.SetText(34210)
else:
- SpellsWindow = GemRB.LoadWindowObject (8)
+ SpellsWindow = GemRB.LoadWindow (8)
DoneButton = SpellsWindow.GetControl (28)
SpellsTextArea = SpellsWindow.GetControl(26)
SpellPointsLeftLabel = SpellsWindow.GetControl (0x10000018)
diff --git a/gemrb/GUIScripts/LevelUp.py b/gemrb/GUIScripts/LevelUp.py
index bf79bc4..320a731 100644
--- a/gemrb/GUIScripts/LevelUp.py
+++ b/gemrb/GUIScripts/LevelUp.py
@@ -73,7 +73,7 @@ def OpenLevelUpWindow():
global OldHPMax, OldSaves, OldLore, OldThaco, DeltaDSpells, DeltaWSpells
global NewDSpells, NewWSpells, OldDSpells, OldWSpells, pc, HLACount, ClassName, IsDual
- LevelUpWindow = GemRB.LoadWindowObject (3)
+ LevelUpWindow = GemRB.LoadWindow (3)
if GameIsBG2():
InfoButton = LevelUpWindow.GetControl (125)
diff --git a/gemrb/GUIScripts/TextScreen.py b/gemrb/GUIScripts/TextScreen.py
index ccbe4f9..889838b 100644
--- a/gemrb/GUIScripts/TextScreen.py
+++ b/gemrb/GUIScripts/TextScreen.py
@@ -64,7 +64,7 @@ def StartTextScreen ():
GemRB.LoadMusicPL ("chapter.mus")
#else: TODO: what about bg2?
- TextScreen = GemRB.LoadWindowObject (ID)
+ TextScreen = GemRB.LoadWindow (ID)
TextScreen.SetFrame ()
TextArea = TextScreen.GetControl (2)
diff --git a/gemrb/GUIScripts/bg1/CharGenCommon.py b/gemrb/GUIScripts/bg1/CharGenCommon.py
index 42d4f25..bcf8fce 100644
--- a/gemrb/GUIScripts/bg1/CharGenCommon.py
+++ b/gemrb/GUIScripts/bg1/CharGenCommon.py
@@ -61,7 +61,7 @@ class CharGen:
CharGenWindow = self.window
else:
GemRB.LoadWindowPack ("GUICG", 640, 480)
- CharGenWindow = GemRB.LoadWindowObject (0)
+ CharGenWindow = GemRB.LoadWindow (0)
CharGenWindow.SetFrame ()
step = self.step
diff --git a/gemrb/GUIScripts/bg1/GUICG1.py b/gemrb/GUIScripts/bg1/GUICG1.py
index bbe69e4..0e657fd 100644
--- a/gemrb/GUIScripts/bg1/GUICG1.py
+++ b/gemrb/GUIScripts/bg1/GUICG1.py
@@ -37,7 +37,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG")
- GenderWindow = GemRB.LoadWindowObject(1)
+ GenderWindow = GemRB.LoadWindow(1)
BackButton = GenderWindow.GetControl(6)
BackButton.SetText(15416)
diff --git a/gemrb/GUIScripts/bg1/GUICG10.py b/gemrb/GUIScripts/bg1/GUICG10.py
index b637fb3..40923e5 100644
--- a/gemrb/GUIScripts/bg1/GUICG10.py
+++ b/gemrb/GUIScripts/bg1/GUICG10.py
@@ -30,7 +30,7 @@ def OnLoad():
global ClassWindow, TextAreaControl, DoneButton
GemRB.LoadWindowPack("GUICG")
- ClassWindow = GemRB.LoadWindowObject(10)
+ ClassWindow = GemRB.LoadWindow(10)
CloseOtherWindow (ClassWindow.Unload)
diff --git a/gemrb/GUIScripts/bg1/GUICG12.py b/gemrb/GUIScripts/bg1/GUICG12.py
index 8ecf951..ac0c2ce 100644
--- a/gemrb/GUIScripts/bg1/GUICG12.py
+++ b/gemrb/GUIScripts/bg1/GUICG12.py
@@ -47,7 +47,7 @@ def OnLoad():
return
GemRB.LoadWindowPack("GUICG")
- AppearanceWindow = GemRB.LoadWindowObject (11)
+ AppearanceWindow = GemRB.LoadWindow (11)
#Load the Gender
MyChar = GemRB.GetVar ("Slot")
@@ -191,7 +191,7 @@ def CustomPress():
global RowCount1, RowCount2
global CustomWindow
- CustomWindow = Window = GemRB.LoadWindowObject (18)
+ CustomWindow = Window = GemRB.LoadWindow (18)
PortraitList1 = Window.GetControl (2)
RowCount1 = PortraitList1.GetPortraits (0)
PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait")
diff --git a/gemrb/GUIScripts/bg1/GUICG13.py b/gemrb/GUIScripts/bg1/GUICG13.py
index e93c81d..a56bb4c 100644
--- a/gemrb/GUIScripts/bg1/GUICG13.py
+++ b/gemrb/GUIScripts/bg1/GUICG13.py
@@ -60,7 +60,7 @@ def OnLoad():
global HairColor, SkinColor, MinorColor, MajorColor
GemRB.LoadWindowPack("GUICG")
- ColorWindow=GemRB.LoadWindowObject(13)
+ ColorWindow=GemRB.LoadWindow(13)
CloseOtherWindow (ColorWindow.Unload)
ColorTable = GemRB.LoadTable("clowncol")
@@ -148,7 +148,7 @@ def DonePress():
def GetColor():
global ColorPicker
- ColorPicker=GemRB.LoadWindowObject(14)
+ ColorPicker=GemRB.LoadWindow(14)
GemRB.SetVar("Selected",-1)
for i in range(34):
Button = ColorPicker.GetControl(i)
diff --git a/gemrb/GUIScripts/bg1/GUICG15.py b/gemrb/GUIScripts/bg1/GUICG15.py
index 700c5df..a4f4507 100644
--- a/gemrb/GUIScripts/bg1/GUICG15.py
+++ b/gemrb/GUIScripts/bg1/GUICG15.py
@@ -67,7 +67,7 @@ def OnLoad():
TableName = ClassSkillsTable.GetValue(ClassName, "HATERACE")
GemRB.LoadWindowPack("GUICG")
- RaceWindow = GemRB.LoadWindowObject(15)
+ RaceWindow = GemRB.LoadWindow(15)
RaceTable = GemRB.LoadTable(TableName)
RaceCount = RaceTable.GetRowCount()-LISTSIZE+1
if RaceCount<0:
diff --git a/gemrb/GUIScripts/bg1/GUICG19.py b/gemrb/GUIScripts/bg1/GUICG19.py
index a726e60..ba33e98 100644
--- a/gemrb/GUIScripts/bg1/GUICG19.py
+++ b/gemrb/GUIScripts/bg1/GUICG19.py
@@ -37,7 +37,7 @@ def OnLoad():
return
GemRB.LoadWindowPack("GUICG", 640, 480)
- CharSoundWindow=GemRB.LoadWindowObject(19)
+ CharSoundWindow=GemRB.LoadWindow(19)
VoiceList = CharSoundWindow.GetControl (45)
VoiceList.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
diff --git a/gemrb/GUIScripts/bg1/GUICG2.py b/gemrb/GUIScripts/bg1/GUICG2.py
index 67ca491..c50539e 100644
--- a/gemrb/GUIScripts/bg1/GUICG2.py
+++ b/gemrb/GUIScripts/bg1/GUICG2.py
@@ -44,7 +44,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG")
ClassCount = ClassTable.GetRowCount()+1
- ClassWindow = GemRB.LoadWindowObject(2)
+ ClassWindow = GemRB.LoadWindow(2)
RaceName = RaceTable.GetRowName(GemRB.GetVar("Race")-1 )
#radiobutton groups must be set up before doing anything else to them
diff --git a/gemrb/GUIScripts/bg1/GUICG22.py b/gemrb/GUIScripts/bg1/GUICG22.py
index b8d7586..bd09a82 100644
--- a/gemrb/GUIScripts/bg1/GUICG22.py
+++ b/gemrb/GUIScripts/bg1/GUICG22.py
@@ -51,7 +51,7 @@ def OnLoad():
SchoolList = GemRB.LoadTable("magesch")
#there is only a specialist mage window for bg1
- KitWindow = GemRB.LoadWindowObject(12)
+ KitWindow = GemRB.LoadWindow(12)
for i in range(8):
Button = KitWindow.GetControl(i+2)
diff --git a/gemrb/GUIScripts/bg1/GUICG3.py b/gemrb/GUIScripts/bg1/GUICG3.py
index d126fea..1cf99ff 100644
--- a/gemrb/GUIScripts/bg1/GUICG3.py
+++ b/gemrb/GUIScripts/bg1/GUICG3.py
@@ -47,7 +47,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG")
AlignmentTable = GemRB.LoadTable("aligns")
- AlignmentWindow = GemRB.LoadWindowObject(3)
+ AlignmentWindow = GemRB.LoadWindow(3)
for i in range(9):
Button = AlignmentWindow.GetControl(i+2)
diff --git a/gemrb/GUIScripts/bg1/GUICG4.py b/gemrb/GUIScripts/bg1/GUICG4.py
index baeb727..dec9a35 100644
--- a/gemrb/GUIScripts/bg1/GUICG4.py
+++ b/gemrb/GUIScripts/bg1/GUICG4.py
@@ -141,7 +141,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG", 640, 480)
AbilityTable = GemRB.LoadTable("ability")
- AbilityWindow = GemRB.LoadWindowObject(4)
+ AbilityWindow = GemRB.LoadWindow(4)
RerollButton = AbilityWindow.GetControl(2)
RerollButton.SetText(11982)
diff --git a/gemrb/GUIScripts/bg1/GUICG5.py b/gemrb/GUIScripts/bg1/GUICG5.py
index c24b13f..9679202 100644
--- a/gemrb/GUIScripts/bg1/GUICG5.py
+++ b/gemrb/GUIScripts/bg1/GUICG5.py
@@ -37,7 +37,7 @@ def OnLoad():
return
GemRB.LoadWindowPack("GUICG")
- NameWindow = GemRB.LoadWindowObject(5)
+ NameWindow = GemRB.LoadWindow(5)
BackButton = NameWindow.GetControl(3)
BackButton.SetText(15416)
diff --git a/gemrb/GUIScripts/bg1/GUICG6.py b/gemrb/GUIScripts/bg1/GUICG6.py
index ad7d364..20bd521 100644
--- a/gemrb/GUIScripts/bg1/GUICG6.py
+++ b/gemrb/GUIScripts/bg1/GUICG6.py
@@ -46,7 +46,7 @@ def OnLoad():
return
GemRB.LoadWindowPack("GUICG")
- SkillWindow = GemRB.LoadWindowObject(6)
+ SkillWindow = GemRB.LoadWindow(6)
MyChar = GemRB.GetVar ("Slot")
diff --git a/gemrb/GUIScripts/bg1/GUICG8.py b/gemrb/GUIScripts/bg1/GUICG8.py
index 6b05bfb..a435ab4 100644
--- a/gemrb/GUIScripts/bg1/GUICG8.py
+++ b/gemrb/GUIScripts/bg1/GUICG8.py
@@ -40,7 +40,7 @@ def OnLoad():
GemRB.SetVar("Race",0)
GemRB.LoadWindowPack("GUICG")
- RaceWindow = GemRB.LoadWindowObject(8)
+ RaceWindow = GemRB.LoadWindow(8)
RaceCount = RaceTable.GetRowCount()
diff --git a/gemrb/GUIScripts/bg1/GUICG9.py b/gemrb/GUIScripts/bg1/GUICG9.py
index e20c72a..cf46e51 100644
--- a/gemrb/GUIScripts/bg1/GUICG9.py
+++ b/gemrb/GUIScripts/bg1/GUICG9.py
@@ -40,7 +40,7 @@ def OnLoad():
global SkillWindow, DoneButton
GemRB.LoadWindowPack("GUICG", 640, 480)
- SkillWindow = GemRB.LoadWindowObject(9)
+ SkillWindow = GemRB.LoadWindow(9)
CloseOtherWindow(SkillWindow.Unload)
diff --git a/gemrb/GUIScripts/bg1/GUICommonWindows.py b/gemrb/GUIScripts/bg1/GUICommonWindows.py
index 68d935b..5393fda 100644
--- a/gemrb/GUIScripts/bg1/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg1/GUICommonWindows.py
@@ -430,7 +430,7 @@ def RunSelectionChangeHandler ():
def OpenPortraitWindow (needcontrols):
global PortraitWindow
- PortraitWindow = Window = GemRB.LoadWindowObject (1)
+ PortraitWindow = Window = GemRB.LoadWindow (1)
if needcontrols:
#Button=Window.GetControl (8)
@@ -682,7 +682,7 @@ def OpenWaitForDiscWindow ():
pass
GemRB.LoadWindowPack ("GUIID")
- DiscWindow = Window = GemRB.LoadWindowObject (0)
+ DiscWindow = Window = GemRB.LoadWindow (0)
GemRB.SetVar ("OtherWindow", Window.ID)
label = DiscWindow.GetControl (0)
diff --git a/gemrb/GUIScripts/bg1/GUIINV.py b/gemrb/GUIScripts/bg1/GUIINV.py
index c73bc47..2199fa5 100644
--- a/gemrb/GUIScripts/bg1/GUIINV.py
+++ b/gemrb/GUIScripts/bg1/GUIINV.py
@@ -82,11 +82,11 @@ def OpenInventoryWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIINV", 640, 480)
- InventoryWindow = Window = GemRB.LoadWindowObject (2)
+ InventoryWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", InventoryWindow.ID)
GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID )
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow")
#saving the original portrait window
OldPortraitWindow = GUICommonWindows.PortraitWindow
@@ -211,7 +211,7 @@ def GetColor ():
ColorTable = GemRB.LoadTable ("clowncol")
InventoryWindow.SetVisible (WINDOW_GRAYED) #darken it
- ColorPicker=GemRB.LoadWindowObject (3)
+ ColorPicker=GemRB.LoadWindow (3)
GemRB.SetVar ("Selected",-1)
for i in range (34):
Button = ColorPicker.GetControl (i)
@@ -589,7 +589,7 @@ def OpenItemAmountWindow ():
return
GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND)
- ItemAmountWindow = Window = GemRB.LoadWindowObject (4)
+ ItemAmountWindow = Window = GemRB.LoadWindow (4)
slot_item = GemRB.GetSlotItem (pc, slot)
ResRef = slot_item['ItemResRef']
@@ -724,7 +724,7 @@ def IdentifyItemWindow ():
pc = GemRB.GameGetSelectedPCSingle ()
- ItemIdentifyWindow = Window = GemRB.LoadWindowObject (9)
+ ItemIdentifyWindow = Window = GemRB.LoadWindow (9)
Button = Window.GetControl (0)
Button.SetText (17105)
Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "IdentifyUseSpell")
@@ -757,7 +757,7 @@ def DisplayItem (itemresref, type):
global ItemInfoWindow
item = GemRB.GetItem (itemresref)
- ItemInfoWindow = Window = GemRB.LoadWindowObject (5)
+ ItemInfoWindow = Window = GemRB.LoadWindow (5)
#fake label
Label = Window.GetControl (0x10000000)
diff --git a/gemrb/GUIScripts/bg1/GUIJRNL.py b/gemrb/GUIScripts/bg1/GUIJRNL.py
index 6fad1fd..11b0c39 100644
--- a/gemrb/GUIScripts/bg1/GUIJRNL.py
+++ b/gemrb/GUIScripts/bg1/GUIJRNL.py
@@ -73,11 +73,11 @@ def OpenJournalWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIJRNL", 640, 480)
- JournalWindow = Window = GemRB.LoadWindowObject (2)
+ JournalWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", JournalWindow.ID)
#saving the original portrait window
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
MarkMenuButton (OptionsWindow)
SetupMenuWindowControls (OptionsWindow, 0, "OpenJournalWindow")
OptionsWindow.SetFrame ()
diff --git a/gemrb/GUIScripts/bg1/GUILOAD.py b/gemrb/GUIScripts/bg1/GUILOAD.py
index 23d929d..a074f60 100644
--- a/gemrb/GUIScripts/bg1/GUILOAD.py
+++ b/gemrb/GUIScripts/bg1/GUILOAD.py
@@ -34,7 +34,7 @@ def OnLoad ():
global LoadWindow, TextAreaControl, Games, ScrollBar
GemRB.LoadWindowPack ("GUILOAD", 640, 480)
- LoadWindow = GemRB.LoadWindowObject (0)
+ LoadWindow = GemRB.LoadWindow (0)
LoadWindow.SetFrame ()
CancelButton=LoadWindow.GetControl (34)
@@ -154,7 +154,7 @@ def DeleteGamePress ():
global ConfirmWindow
LoadWindow.SetVisible (WINDOW_INVISIBLE)
- ConfirmWindow=GemRB.LoadWindowObject (1)
+ ConfirmWindow=GemRB.LoadWindow (1)
Text=ConfirmWindow.GetControl (0)
Text.SetText (15305)
DeleteButton=ConfirmWindow.GetControl (1)
diff --git a/gemrb/GUIScripts/bg1/GUIMA.py b/gemrb/GUIScripts/bg1/GUIMA.py
index 0622c25..12d4839 100644
--- a/gemrb/GUIScripts/bg1/GUIMA.py
+++ b/gemrb/GUIScripts/bg1/GUIMA.py
@@ -96,12 +96,12 @@ def ShowMap ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIMAP", 640, 480)
- MapWindow = Window = GemRB.LoadWindowObject (2)
+ MapWindow = Window = GemRB.LoadWindow (2)
#this window type blocks the game normally, but map window doesn't
GemRB.SetVar ("OtherWindow", MapWindow.ID)
#saving the original portrait window
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "ShowMap")
OldPortraitWindow = GUICommonWindows.PortraitWindow
PortraitWindow = OpenPortraitWindow (0)
@@ -155,12 +155,12 @@ def OpenMapWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIMAP", 640, 480)
- MapWindow = Window = GemRB.LoadWindowObject (2)
+ MapWindow = Window = GemRB.LoadWindow (2)
#this window type blocks the game normally, but map window doesn't
GemRB.SetVar ("OtherWindow", MapWindow.ID)
#saving the original portrait window
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
MarkMenuButton (OptionsWindow)
SetupMenuWindowControls (OptionsWindow, 0, "OpenMapWindow")
OldPortraitWindow = GUICommonWindows.PortraitWindow
@@ -257,7 +257,7 @@ def WorldMapWindowCommon (Travel):
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIWMAP", 640, 480)
- WorldMapWindow = Window = GemRB.LoadWindowObject (0)
+ WorldMapWindow = Window = GemRB.LoadWindow (0)
#saving the original portrait window
Window.SetFrame ()
diff --git a/gemrb/GUIScripts/bg1/GUIMG.py b/gemrb/GUIScripts/bg1/GUIMG.py
index 904776d..c5a8b81 100644
--- a/gemrb/GUIScripts/bg1/GUIMG.py
+++ b/gemrb/GUIScripts/bg1/GUIMG.py
@@ -58,10 +58,10 @@ def OpenMageWindow ():
GemRB.HideGUI ()
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIMG")
- MageWindow = Window = GemRB.LoadWindowObject (2)
+ MageWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", MageWindow.ID)
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "OpenMageWindow")
OptionsWindow.SetFrame ()
@@ -217,7 +217,7 @@ def OpenMageSpellInfoWindow ():
MageSpellInfoWindow = None
return
- MageSpellInfoWindow = Window = GemRB.LoadWindowObject (3)
+ MageSpellInfoWindow = Window = GemRB.LoadWindow (3)
#back
Button = Window.GetControl (5)
@@ -268,7 +268,7 @@ def CloseMageSpellUnmemorizeWindow ():
#def OpenMageSpellRemoveWindow ():
# global MageSpellUnmemorizeWindow
#
-# MageSpellUnmemorizeWindow = Window = GemRB.LoadWindowObject (5)
+# MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
#
# # "Are you sure you want to ....?"
# TextArea = Window.GetControl (3)
@@ -292,7 +292,7 @@ def CloseMageSpellUnmemorizeWindow ():
def OpenMageSpellUnmemorizeWindow ():
global MageSpellUnmemorizeWindow
- MageSpellUnmemorizeWindow = Window = GemRB.LoadWindowObject (5)
+ MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
# "Are you sure you want to ....?"
TextArea = Window.GetControl (3)
diff --git a/gemrb/GUIScripts/bg1/GUIMOVIE.py b/gemrb/GUIScripts/bg1/GUIMOVIE.py
index a540671..f5a386c 100644
--- a/gemrb/GUIScripts/bg1/GUIMOVIE.py
+++ b/gemrb/GUIScripts/bg1/GUIMOVIE.py
@@ -27,7 +27,7 @@ def OnLoad():
global MovieWindow, TextAreaControl, MoviesTable, PlayButton
GemRB.LoadWindowPack ("GUIMOVIE")
- MovieWindow = GemRB.LoadWindowObject (0)
+ MovieWindow = GemRB.LoadWindow (0)
TextAreaControl = MovieWindow.GetControl (0)
PlayButton = MovieWindow.GetControl (2)
CreditsButton = MovieWindow.GetControl (3)
diff --git a/gemrb/GUIScripts/bg1/GUIMP.py b/gemrb/GUIScripts/bg1/GUIMP.py
index b8f8e10..7dcf391 100644
--- a/gemrb/GUIScripts/bg1/GUIMP.py
+++ b/gemrb/GUIScripts/bg1/GUIMP.py
@@ -26,7 +26,7 @@ def OnLoad():
global PartyFormationWindow
GemRB.LoadWindowPack("GUIMP")
- PartyFormationWindow = GemRB.LoadWindowObject(0)
+ PartyFormationWindow = GemRB.LoadWindow(0)
ExitButton = PartyFormationWindow.GetControl(30)
ExitButton.SetText(13906)
@@ -79,7 +79,7 @@ def OnLoad():
def ExitPress():
global PartyFormationWindow, ExitWindow
PartyFormationWindow.SetVisible(WINDOW_INVISIBLE)
- ExitWindow = GemRB.LoadWindowObject(7)
+ ExitWindow = GemRB.LoadWindow(7)
TextArea = ExitWindow.GetControl(0)
TextArea.SetText(11329)
diff --git a/gemrb/GUIScripts/bg1/GUIOPT.py b/gemrb/GUIScripts/bg1/GUIOPT.py
index 9b5dcae..40d5465 100644
--- a/gemrb/GUIScripts/bg1/GUIOPT.py
+++ b/gemrb/GUIScripts/bg1/GUIOPT.py
@@ -94,11 +94,11 @@ def OpenOptionsWindow ():
SetSelectionChangeHandler (DummyWindow)
GemRB.LoadWindowPack ("GUIOPT", 640, 480)
- GameOptionsWindow = Window = GemRB.LoadWindowObject (2)
+ GameOptionsWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", GameOptionsWindow.ID)
if OldOptionsWindow == None:
OldOptionsWindow = OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "OpenOptionsWindow")
OptionsWindow.SetFrame ()
@@ -166,7 +166,7 @@ def OpenVideoOptionsWindow ():
SubOptionsWindow.Unload()
SubOptionsWindow = None
- SubOptionsWindow = Window = GemRB.LoadWindowObject (6)
+ SubOptionsWindow = Window = GemRB.LoadWindow (6)
HelpTextArea = OptHelpText ('VideoOptions', Window, 33, 18038)
@@ -236,7 +236,7 @@ def OpenAudioOptionsWindow ():
SubOptionsWindow.Unload ()
SubOptionsWindow = None
- SubOptionsWindow = Window = GemRB.LoadWindowObject (7)
+ SubOptionsWindow = Window = GemRB.LoadWindow (7)
HelpTextArea = OptHelpText ('AudioOptions', Window, 14, 18040)
@@ -296,7 +296,7 @@ def OpenCharacterSoundsWindow ():
SubSubOptionsWindow.Unload ()
SubSubOptionsWindow = None
- SubSubOptionsWindow = Window = GemRB.LoadWindowObject (12)
+ SubSubOptionsWindow = Window = GemRB.LoadWindow (12)
HelpTextArea2 = OptHelpText ('CharacterSounds', Window, 16, 18041)
@@ -333,7 +333,7 @@ def OpenGameplayOptionsWindow ():
SubOptionsWindow.Unload ()
SubOptionsWindow = None
- SubOptionsWindow = Window = GemRB.LoadWindowObject (8)
+ SubOptionsWindow = Window = GemRB.LoadWindow (8)
HelpTextArea = OptHelpText ('GameplayOptions', Window, 40, 18042)
@@ -404,7 +404,7 @@ def OpenFeedbackOptionsWindow ():
SubSubOptionsWindow.Unload ()
SubSubOptionsWindow = None
- SubSubOptionsWindow = Window = GemRB.LoadWindowObject (9)
+ SubSubOptionsWindow = Window = GemRB.LoadWindow (9)
HelpTextArea2 = OptHelpText ('FeedbackOptions', Window, 28, 18043)
@@ -466,7 +466,7 @@ def OpenAutopauseOptionsWindow ():
SubSubOptionsWindow.Unload ()
SubSubOptionsWindow = None
- SubSubOptionsWindow = Window = GemRB.LoadWindowObject (10)
+ SubSubOptionsWindow = Window = GemRB.LoadWindow (10)
HelpTextArea2 = OptHelpText ('AutopauseOptions', Window, 15, 18044)
@@ -526,7 +526,7 @@ def OpenLoadMsgWindow ():
if LoadMsgWindow:
return
- LoadMsgWindow = Window = GemRB.LoadWindowObject (4)
+ LoadMsgWindow = Window = GemRB.LoadWindow (4)
# Load
Button = Window.GetControl (0)
@@ -595,7 +595,7 @@ def OpenQuitMsgWindow ():
if QuitMsgWindow:
return
- QuitMsgWindow = Window = GemRB.LoadWindowObject (5)
+ QuitMsgWindow = Window = GemRB.LoadWindow (5)
# Save
Button = Window.GetControl (0)
diff --git a/gemrb/GUIScripts/bg1/GUIPR.py b/gemrb/GUIScripts/bg1/GUIPR.py
index ea8f3ef..d6367d1 100644
--- a/gemrb/GUIScripts/bg1/GUIPR.py
+++ b/gemrb/GUIScripts/bg1/GUIPR.py
@@ -61,10 +61,10 @@ def OpenPriestWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIPR")
- PriestWindow = Window = GemRB.LoadWindowObject (2)
+ PriestWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", PriestWindow.ID)
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "OpenPriestWindow")
OptionsWindow.SetFrame ()
@@ -216,7 +216,7 @@ def OpenPriestSpellInfoWindow ():
PriestSpellInfoWindow = None
return
- PriestSpellInfoWindow = Window = GemRB.LoadWindowObject (3)
+ PriestSpellInfoWindow = Window = GemRB.LoadWindow (3)
#back
Button = Window.GetControl (5)
@@ -260,7 +260,7 @@ def OnPriestMemorizeSpell ():
def OpenPriestSpellRemoveWindow ():
global PriestSpellUnmemorizeWindow
- PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindowObject (5)
+ PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
# "Are you sure you want to ....?"
TextArea = Window.GetControl (3)
@@ -292,7 +292,7 @@ def ClosePriestSpellUnmemorizeWindow ():
def OpenPriestSpellUnmemorizeWindow ():
global PriestSpellUnmemorizeWindow
- PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindowObject (5)
+ PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
# "Are you sure you want to ....?"
TextArea = Window.GetControl (3)
diff --git a/gemrb/GUIScripts/bg1/GUIREC.py b/gemrb/GUIScripts/bg1/GUIREC.py
index 76a82e8..7caf4f3 100644
--- a/gemrb/GUIScripts/bg1/GUIREC.py
+++ b/gemrb/GUIScripts/bg1/GUIREC.py
@@ -78,11 +78,11 @@ def OpenRecordsWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIREC")
- RecordsWindow = Window = GemRB.LoadWindowObject (2)
+ RecordsWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", RecordsWindow.ID)
# saving the original portrait window
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
SetupMenuWindowControls (OptionsWindow, 0, "OpenRecordsWindow")
OptionsWindow.SetFrame ()
@@ -584,7 +584,7 @@ def OpenInformationWindow ():
return
- InformationWindow = Window = GemRB.LoadWindowObject (4)
+ InformationWindow = Window = GemRB.LoadWindow (4)
# Biography
Button = Window.GetControl (26)
@@ -715,7 +715,7 @@ def OpenBiographyWindow ():
if BiographyWindow != None:
return
- BiographyWindow = Window = GemRB.LoadWindowObject (12)
+ BiographyWindow = Window = GemRB.LoadWindow (12)
GemRB.SetVar ("FloatWindow", BiographyWindow.ID)
TextArea = Window.GetControl (0)
@@ -742,7 +742,7 @@ def CloseBiographyWindow ():
def OpenExportWindow ():
global ExportWindow, NameField, ExportDoneButton
- ExportWindow = GemRB.LoadWindowObject (13)
+ ExportWindow = GemRB.LoadWindow (13)
TextArea = ExportWindow.GetControl (2)
TextArea.SetText (10962)
@@ -799,7 +799,7 @@ def OpenCustomizeWindow ():
PortraitsTable = GemRB.LoadTable ("PICTURES")
ScriptsTable = GemRB.LoadTable ("SCRPDESC")
ColorTable = GemRB.LoadTable ("CLOWNCOL")
- CustomizeWindow = GemRB.LoadWindowObject (17)
+ CustomizeWindow = GemRB.LoadWindow (17)
PortraitSelectButton = CustomizeWindow.GetControl (0)
PortraitSelectButton.SetText (11961)
@@ -870,7 +870,7 @@ def OpenPortraitSelectWindow ():
global PortraitButton
global Gender, LastPortrait
- SubCustomizeWindow = GemRB.LoadWindowObject (18)
+ SubCustomizeWindow = GemRB.LoadWindow (18)
pc = GemRB.GameGetSelectedPCSingle ()
Gender = GemRB.GetPlayerStat (pc, IE_SEX, 1)
PortraitName = GemRB.GetPlayerPortrait (pc, 0)
@@ -952,7 +952,7 @@ def OpenCustomPortraitWindow ():
global PortraitList1, PortraitList2
global RowCount1, RowCount2
- SubSubCustomizeWindow = GemRB.LoadWindowObject (19)
+ SubSubCustomizeWindow = GemRB.LoadWindow (19)
SmallPortraitButton = SubSubCustomizeWindow.GetControl (1)
SmallPortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
@@ -1049,7 +1049,7 @@ def OpenSoundWindow ():
global VoiceList
global Gender
- SubCustomizeWindow = GemRB.LoadWindowObject (20)
+ SubCustomizeWindow = GemRB.LoadWindow (20)
VoiceList = SubCustomizeWindow.GetControl (5)
VoiceList.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
@@ -1109,7 +1109,7 @@ def OpenColorWindow ():
MajorColor = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR)
SkinColor = GemRB.GetPlayerStat (pc, IE_SKIN_COLOR)
HairColor = GemRB.GetPlayerStat (pc, IE_HAIR_COLOR)
- SubCustomizeWindow = GemRB.LoadWindowObject (21)
+ SubCustomizeWindow = GemRB.LoadWindow (21)
PortraitButton = SubCustomizeWindow.GetControl (0)
PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
@@ -1197,7 +1197,7 @@ def OpenColorPicker ():
global SubSubCustomizeWindow
#global Selected
- SubSubCustomizeWindow = GemRB.LoadWindowObject (22)
+ SubSubCustomizeWindow = GemRB.LoadWindow (22)
GemRB.SetVar ("Selected",-1)
for i in range (1,35):
@@ -1249,7 +1249,7 @@ def OpenScriptWindow ():
global SubCustomizeWindow
global ScriptTextArea, SelectedTextArea
- SubCustomizeWindow = GemRB.LoadWindowObject (11)
+ SubCustomizeWindow = GemRB.LoadWindow (11)
ScriptTextArea = SubCustomizeWindow.GetControl (2)
ScriptTextArea.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
@@ -1321,7 +1321,7 @@ def OpenBiographyEditWindow ():
if BioStrRef != 33347:
Changed = 1
- SubCustomizeWindow = GemRB.LoadWindowObject (23)
+ SubCustomizeWindow = GemRB.LoadWindow (23)
ClearButton = SubCustomizeWindow.GetControl (5)
ClearButton.SetText (34881)
diff --git a/gemrb/GUIScripts/bg1/GUISAVE.py b/gemrb/GUIScripts/bg1/GUISAVE.py
index 265f849..64d963f 100644
--- a/gemrb/GUIScripts/bg1/GUISAVE.py
+++ b/gemrb/GUIScripts/bg1/GUISAVE.py
@@ -46,7 +46,7 @@ def OpenSaveWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUISAVE", 640, 480)
- Window = SaveWindow = GemRB.LoadWindowObject (0)
+ Window = SaveWindow = GemRB.LoadWindow (0)
Window.SetFrame ()
CancelButton=Window.GetControl (34)
CancelButton.SetText (13727)
@@ -163,7 +163,7 @@ def SavePress():
global ConfirmWindow, NameField, SaveButton
Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx")
- ConfirmWindow = GemRB.LoadWindowObject (1)
+ ConfirmWindow = GemRB.LoadWindow (1)
#slot name
if Pos<len(Games):
@@ -250,7 +250,7 @@ def DeleteGamePress():
global ConfirmWindow
SaveWindow.SetVisible (WINDOW_INVISIBLE)
- ConfirmWindow=GemRB.LoadWindowObject (2)
+ ConfirmWindow=GemRB.LoadWindow (2)
Text=ConfirmWindow.GetControl (0)
Text.SetText (15305)
DeleteButton=ConfirmWindow.GetControl (1)
diff --git a/gemrb/GUIScripts/bg1/GUISTORE.py b/gemrb/GUIScripts/bg1/GUISTORE.py
index e2a4b78..2f6eb1e 100644
--- a/gemrb/GUIScripts/bg1/GUISTORE.py
+++ b/gemrb/GUIScripts/bg1/GUISTORE.py
@@ -137,11 +137,11 @@ def OpenStoreWindow ():
GemRB.SetVar ("Action", 0)
GemRB.LoadWindowPack ("GUISTORE", 640, 480)
- StoreWindow = Window = GemRB.LoadWindowObject (3)
+ StoreWindow = Window = GemRB.LoadWindow (3)
#saving the original portrait window
#OldPortraitWindow = GUICommonWindows.PortraitWindow
#PortraitWindow = OpenPortraitWindow (0)
- ActionWindow = GemRB.LoadWindowObject (0)
+ ActionWindow = GemRB.LoadWindow (0)
#this window is static and grey, but good to stick the frame onto
ActionWindow.SetFrame ()
@@ -187,7 +187,7 @@ def OpenStoreShoppingWindow ():
CloseWindows()
- StoreShoppingWindow = Window = GemRB.LoadWindowObject (2)
+ StoreShoppingWindow = Window = GemRB.LoadWindow (2)
# buy price ...
Label = Window.GetControl (0x1000002b)
@@ -255,7 +255,7 @@ def OpenStoreIdentifyWindow ():
GemRB.SetVar ("TopIndex", 0)
CloseWindows()
- StoreIdentifyWindow = Window = GemRB.LoadWindowObject (4)
+ StoreIdentifyWindow = Window = GemRB.LoadWindow (4)
# Identify
LeftButton = Button = Window.GetControl (5)
@@ -292,7 +292,7 @@ def OpenStoreStealWindow ():
GemRB.SetVar ("RightTopIndex", 0)
CloseWindows()
- StoreStealWindow = Window = GemRB.LoadWindowObject (6)
+ StoreStealWindow = Window = GemRB.LoadWindow (6)
# left scrollbar
ScrollBarLeft = Window.GetControl (9)
@@ -335,7 +335,7 @@ def OpenStoreDonateWindow ():
CloseWindows ()
- StoreDonateWindow = Window = GemRB.LoadWindowObject (9)
+ StoreDonateWindow = Window = GemRB.LoadWindow (9)
# graphics
Button = Window.GetControl (10)
@@ -373,7 +373,7 @@ def OpenStoreHealWindow ():
GemRB.SetVar ("TopIndex", 0)
CloseWindows()
- StoreHealWindow = Window = GemRB.LoadWindowObject (5)
+ StoreHealWindow = Window = GemRB.LoadWindow (5)
ScrollBar = Window.GetControl (7)
ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreHealWindow")
@@ -413,7 +413,7 @@ def OpenStoreRumourWindow ():
GemRB.SetVar ("TopIndex", 0)
CloseWindows()
- StoreRumourWindow = Window = GemRB.LoadWindowObject (8)
+ StoreRumourWindow = Window = GemRB.LoadWindow (8)
#removing those pesky labels
for i in range (5):
@@ -446,7 +446,7 @@ def OpenStoreRentWindow ():
CloseWindows()
- StoreRentWindow = Window = GemRB.LoadWindowObject (7)
+ StoreRentWindow = Window = GemRB.LoadWindow (7)
# room types
RentIndex = -1
@@ -865,7 +865,7 @@ def InfoWindow (Slot, Item):
Identify = Slot['Flags'] & IE_INV_ITEM_IDENTIFIED
- MessageWindow = Window = GemRB.LoadWindowObject (12)
+ MessageWindow = Window = GemRB.LoadWindow (12)
#fake label
Label = Window.GetControl (0x10000000)
@@ -1124,7 +1124,7 @@ def InfoHealWindow ():
Cure = GemRB.GetStoreCure (Index)
Spell = GemRB.GetSpell (Cure['CureResRef'])
- MessageWindow = Window = GemRB.LoadWindowObject (14)
+ MessageWindow = Window = GemRB.LoadWindow (14)
Label = Window.GetControl (0x10000000)
Label.SetText (Spell['SpellName'])
@@ -1259,7 +1259,7 @@ def RentRoom ():
ErrorWindow (11051)
return
- RentConfirmWindow = Window = GemRB.LoadWindowObject (11)
+ RentConfirmWindow = Window = GemRB.LoadWindow (11)
#confirm
Button = Window.GetControl (0)
Button.SetText (17199)
@@ -1345,7 +1345,7 @@ def CloseStoreRentWindow ():
def ErrorWindow (strref):
global MessageWindow
- MessageWindow = Window = GemRB.LoadWindowObject (10)
+ MessageWindow = Window = GemRB.LoadWindow (10)
TextArea = Window.GetControl (3)
TextArea.SetText (strref)
diff --git a/gemrb/GUIScripts/bg1/GUIWORLD.py b/gemrb/GUIScripts/bg1/GUIWORLD.py
index 90c883f..830d34b 100644
--- a/gemrb/GUIScripts/bg1/GUIWORLD.py
+++ b/gemrb/GUIScripts/bg1/GUIWORLD.py
@@ -68,7 +68,7 @@ def OpenEndMessageWindow ():
if not ContinueWindow:
GemRB.LoadWindowPack (GetWindowPack())
- ContinueWindow = Window = GemRB.LoadWindowObject (9)
+ ContinueWindow = Window = GemRB.LoadWindow (9)
OldActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") )
GemRB.SetVar ("ActionsWindow", Window.ID)
@@ -87,7 +87,7 @@ def OpenContinueMessageWindow ():
if not ContinueWindow:
GemRB.LoadWindowPack (GetWindowPack())
- ContinueWindow = Window = GemRB.LoadWindowObject (9)
+ ContinueWindow = Window = GemRB.LoadWindow (9)
OldActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") )
GemRB.SetVar ("ActionsWindow", Window.ID)
@@ -215,7 +215,7 @@ def OpenContainerWindow ():
hideflag = GemRB.HideGUI ()
GemRB.LoadWindowPack (GetWindowPack())
- ContainerWindow = Window = GemRB.LoadWindowObject (8)
+ ContainerWindow = Window = GemRB.LoadWindow (8)
OldActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") )
OldMessageWindow = GWindow( GemRB.GetVar ("MessageWindow") )
GemRB.SetVar ("ActionsWindow", Window.ID)
@@ -356,7 +356,7 @@ def RemovePlayer ():
GemRB.LoadWindowPack (GetWindowPack())
if ReformPartyWindow:
ReformPartyWindow.Unload ()
- ReformPartyWindow = Window = GemRB.LoadWindowObject (25)
+ ReformPartyWindow = Window = GemRB.LoadWindow (25)
GemRB.SetVar ("OtherWindow", Window.ID)
#are you sure
@@ -422,7 +422,7 @@ def OpenReformPartyWindow ():
return
GemRB.LoadWindowPack (GetWindowPack())
- ReformPartyWindow = Window = GemRB.LoadWindowObject (24)
+ ReformPartyWindow = Window = GemRB.LoadWindow (24)
GemRB.SetVar ("OtherWindow", Window.ID)
#PC portraits
@@ -467,7 +467,7 @@ def DeathWindowEnd ():
GemRB.GamePause (1,1)
GemRB.LoadWindowPack (GetWindowPack())
- Window = GemRB.LoadWindowObject (17)
+ Window = GemRB.LoadWindow (17)
#reason for death
Label = Window.GetControl (0x0fffffff)
diff --git a/gemrb/GUIScripts/bg1/ImportFile.py b/gemrb/GUIScripts/bg1/ImportFile.py
index e9ad445..a472291 100644
--- a/gemrb/GUIScripts/bg1/ImportFile.py
+++ b/gemrb/GUIScripts/bg1/ImportFile.py
@@ -28,7 +28,7 @@ def OnLoad():
global ImportWindow, TextAreaControl
GemRB.LoadWindowPack("GUICG")
- ImportWindow = GemRB.LoadWindowObject(20)
+ ImportWindow = GemRB.LoadWindow(20)
CloseOtherWindow(ImportWindow.Unload)
diff --git a/gemrb/GUIScripts/bg1/LoadScreen.py b/gemrb/GUIScripts/bg1/LoadScreen.py
index deaec9d..ac7f3d4 100644
--- a/gemrb/GUIScripts/bg1/LoadScreen.py
+++ b/gemrb/GUIScripts/bg1/LoadScreen.py
@@ -30,7 +30,7 @@ def StartLoadScreen ():
global LoadScreen
GemRB.LoadWindowPack ("guils")
- LoadScreen = GemRB.LoadWindowObject (0)
+ LoadScreen = GemRB.LoadWindow (0)
LoadPic = GemRB.GetGameString (STR_LOADMOS)
if LoadPic=="":
LoadPic = "GUILS0"+str(GemRB.Roll(1,9,0))
diff --git a/gemrb/GUIScripts/bg1/MessageWindow.py b/gemrb/GUIScripts/bg1/MessageWindow.py
index b0b9e6e..f031774 100644
--- a/gemrb/GUIScripts/bg1/MessageWindow.py
+++ b/gemrb/GUIScripts/bg1/MessageWindow.py
@@ -54,8 +54,8 @@ def OnLoad():
GUICommonWindows.ActionsWindow = None
GUICommonWindows.OptionsWindow = None
- ActionsWindow = GemRB.LoadWindowObject(3)
- OptionsWindow = GemRB.LoadWindowObject(0)
+ ActionsWindow = GemRB.LoadWindow(3)
+ OptionsWindow = GemRB.LoadWindow(0)
PortraitWindow = OpenPortraitWindow(1)
GemRB.SetVar("PortraitWindow", PortraitWindow.ID)
@@ -105,7 +105,7 @@ def UpdateControlStatus():
GemRB.LoadWindowPack(GetWindowPack())
if Expand == GS_MEDIUMDIALOG:
- TMessageWindow = GemRB.LoadWindowObject(12)
+ TMessageWindow = GemRB.LoadWindow(12)
TMessageTA = TMessageWindow.GetControl(1)
ExpandButton = TMessageWindow.GetControl(0)
ExpandButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize")
@@ -113,13 +113,13 @@ def UpdateControlStatus():
ContractButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize")
elif Expand == GS_LARGEDIALOG:
- TMessageWindow = GemRB.LoadWindowObject(7)
+ TMessageWindow = GemRB.LoadWindow(7)
TMessageTA = TMessageWindow.GetControl(1)
ContractButton = TMessageWindow.GetControl(0)
ContractButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize")
else:
- TMessageWindow = GemRB.LoadWindowObject(4)
+ TMessageWindow = GemRB.LoadWindow(4)
TMessageTA = TMessageWindow.GetControl(3)
ExpandButton = TMessageWindow.GetControl(2)
ExpandButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize")
diff --git a/gemrb/GUIScripts/bg1/Start.py b/gemrb/GUIScripts/bg1/Start.py
index 5ac970b..4b7b055 100644
--- a/gemrb/GUIScripts/bg1/Start.py
+++ b/gemrb/GUIScripts/bg1/Start.py
@@ -44,7 +44,7 @@ def OnLoad():
GemRB.LoadWindowPack("START")
#quit subwindow
- QuitWindow = GemRB.LoadWindowObject(3)
+ QuitWindow = GemRB.LoadWindow(3)
QuitTextArea = QuitWindow.GetControl(0)
CancelButton = QuitWindow.GetControl(2)
ConfirmButton = QuitWindow.GetControl(1)
@@ -57,7 +57,7 @@ def OnLoad():
CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
#main window
- StartWindow = GemRB.LoadWindowObject(0)
+ StartWindow = GemRB.LoadWindow(0)
SinglePlayerButton = StartWindow.GetControl(0)
MultiPlayerButton = StartWindow.GetControl(1)
MoviesButton = StartWindow.GetControl(2)
diff --git a/gemrb/GUIScripts/bg2/CharGenCommon.py b/gemrb/GUIScripts/bg2/CharGenCommon.py
index 783ffef..d17f179 100644
--- a/gemrb/GUIScripts/bg2/CharGenCommon.py
+++ b/gemrb/GUIScripts/bg2/CharGenCommon.py
@@ -33,7 +33,7 @@ def DisplayOverview(step):
global CharGenWindow, TextAreaControl, PortraitName
GemRB.LoadWindowPack ("GUICG", 640, 480)
- CharGenWindow = GemRB.LoadWindowObject (0)
+ CharGenWindow = GemRB.LoadWindow (0)
CharGenWindow.SetFrame ()
GemRB.SetVar ("Step", step)
diff --git a/gemrb/GUIScripts/bg2/DualClass.py b/gemrb/GUIScripts/bg2/DualClass.py
index aed3343..c46ef14 100644
--- a/gemrb/GUIScripts/bg2/DualClass.py
+++ b/gemrb/GUIScripts/bg2/DualClass.py
@@ -72,7 +72,7 @@ def DualClassWindow ():
NewClassId = 0
# set up our main window
- DCMainWindow = GemRB.LoadWindowObject (5)
+ DCMainWindow = GemRB.LoadWindow (5)
# done button (off)
DCMainDoneButton = DCMainWindow.GetControl (2)
@@ -264,7 +264,7 @@ def DCMainClassPress ():
GemRB.SetVar ("DCClass", DCClass)
# open the window
- DCClassWindow = GemRB.LoadWindowObject (6)
+ DCClassWindow = GemRB.LoadWindow (6)
# string refs for the given classes
DCClassStrings = []
@@ -427,7 +427,7 @@ def DCOpenProfsWindow ():
global DCProfsWindow, DCProfsDoneButton
# load up our window and set some basic variables
- DCProfsWindow = GemRB.LoadWindowObject (15)
+ DCProfsWindow = GemRB.LoadWindow (15)
NewClassId = ClassTable.GetValue (ClassName, "ID", 1)
SetupProfsWindow (pc, LUPROFS_TYPE_DUALCLASS, DCProfsWindow, DCProfsRedraw, classid=NewClassId)
@@ -524,7 +524,7 @@ def OpenSkillsWindow ():
global DCSkillsWindow, DCSkillsDoneButton
- DCSkillsWindow = GemRB.LoadWindowObject (7)
+ DCSkillsWindow = GemRB.LoadWindow (7)
SetupSkillsWindow (pc, LUSKILLS_TYPE_DUALCLASS, DCSkillsWindow, DCSkillsRedraw, classid=NewClassId)
#just go back if we can't assign skills
diff --git a/gemrb/GUIScripts/bg2/ExportFile.py b/gemrb/GUIScripts/bg2/ExportFile.py
index ec6409e..ef3bef1 100644
--- a/gemrb/GUIScripts/bg2/ExportFile.py
+++ b/gemrb/GUIScripts/bg2/ExportFile.py
@@ -27,7 +27,7 @@ def OnLoad():
global ImportWindow, TextAreaControl
GemRB.LoadWindowPack ("GUICG",640,480)
- ImportWindow = GemRB.LoadWindowObject (21)
+ ImportWindow = GemRB.LoadWindow (21)
TextAreaControl = ImportWindow.GetControl (4)
TextAreaControl.SetText (10962)
diff --git a/gemrb/GUIScripts/bg2/GUICG1.py b/gemrb/GUIScripts/bg2/GUICG1.py
index 00f8c9f..37c3ac9 100644
--- a/gemrb/GUIScripts/bg2/GUICG1.py
+++ b/gemrb/GUIScripts/bg2/GUICG1.py
@@ -31,7 +31,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG", 640, 480)
MyChar = GemRB.GetVar ("Slot")
#this hack will redraw the base CG window
- GenderWindow = GemRB.LoadWindowObject(0)
+ GenderWindow = GemRB.LoadWindow(0)
PortraitButton = GenderWindow.GetControl(12)
PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
ImportButton = GenderWindow.GetControl(13)
@@ -50,7 +50,7 @@ def OnLoad():
GemRB.DrawWindows()
if GenderWindow:
GenderWindow.Unload()
- GenderWindow = GemRB.LoadWindowObject(1)
+ GenderWindow = GemRB.LoadWindow(1)
BackButton = GenderWindow.GetControl(6)
BackButton.SetText(15416)
diff --git a/gemrb/GUIScripts/bg2/GUICG10.py b/gemrb/GUIScripts/bg2/GUICG10.py
index e115136..bc16591 100644
--- a/gemrb/GUIScripts/bg2/GUICG10.py
+++ b/gemrb/GUIScripts/bg2/GUICG10.py
@@ -30,7 +30,7 @@ def OnLoad():
global ClassWindow, TextAreaControl, DoneButton, MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- ClassWindow = GemRB.LoadWindowObject(10)
+ ClassWindow = GemRB.LoadWindow(10)
MyChar = GemRB.GetVar ("Slot")
ClassCount = ClassTable.GetRowCount()+1
diff --git a/gemrb/GUIScripts/bg2/GUICG12.py b/gemrb/GUIScripts/bg2/GUICG12.py
index 3c16bbd..c6ca87f 100644
--- a/gemrb/GUIScripts/bg2/GUICG12.py
+++ b/gemrb/GUIScripts/bg2/GUICG12.py
@@ -40,7 +40,7 @@ def OnLoad():
Gender=GemRB.GetVar ("Gender")
GemRB.LoadWindowPack ("GUICG", 640, 480)
- AppearanceWindow = GemRB.LoadWindowObject (11)
+ AppearanceWindow = GemRB.LoadWindow (11)
#Load the Portraits Table
PortraitsTable = GemRB.LoadTable ("PICTURES")
@@ -191,7 +191,7 @@ def CustomPress():
global RowCount1, RowCount2
global CustomWindow
- CustomWindow = Window = GemRB.LoadWindowObject (18)
+ CustomWindow = Window = GemRB.LoadWindow (18)
PortraitList1 = Window.GetControl (2)
RowCount1 = PortraitList1.GetPortraits (0)
PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait")
diff --git a/gemrb/GUIScripts/bg2/GUICG13.py b/gemrb/GUIScripts/bg2/GUICG13.py
index 9f43418..3aa257e 100644
--- a/gemrb/GUIScripts/bg2/GUICG13.py
+++ b/gemrb/GUIScripts/bg2/GUICG13.py
@@ -62,7 +62,7 @@ def OnLoad():
global MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- ColorWindow=GemRB.LoadWindowObject(13)
+ ColorWindow=GemRB.LoadWindow(13)
MyChar = GemRB.GetVar ("Slot")
ColorTable = GemRB.LoadTable("clowncol")
@@ -150,7 +150,7 @@ def DonePress():
def GetColor():
global ColorPicker
- ColorPicker=GemRB.LoadWindowObject(14)
+ ColorPicker=GemRB.LoadWindow(14)
GemRB.SetVar("Selected",-1)
for i in range(34):
Button = ColorPicker.GetControl(i)
diff --git a/gemrb/GUIScripts/bg2/GUICG15.py b/gemrb/GUIScripts/bg2/GUICG15.py
index 38753b4..b24b1dc 100644
--- a/gemrb/GUIScripts/bg2/GUICG15.py
+++ b/gemrb/GUIScripts/bg2/GUICG15.py
@@ -60,7 +60,7 @@ def OnLoad():
GemRB.SetNextScript("GUICG7")
return
GemRB.LoadWindowPack("GUICG", 640, 480)
- RaceWindow = GemRB.LoadWindowObject(15)
+ RaceWindow = GemRB.LoadWindow(15)
RaceTable = GemRB.LoadTable(TableName)
RaceCount = RaceTable.GetRowCount()-LISTSIZE+1
if RaceCount<0:
diff --git a/gemrb/GUIScripts/bg2/GUICG19.py b/gemrb/GUIScripts/bg2/GUICG19.py
index 38915a5..7633d85 100644
--- a/gemrb/GUIScripts/bg2/GUICG19.py
+++ b/gemrb/GUIScripts/bg2/GUICG19.py
@@ -33,7 +33,7 @@ def OnLoad():
global CharSoundWindow, VoiceList
GemRB.LoadWindowPack("GUICG", 640, 480)
- CharSoundWindow=GemRB.LoadWindowObject(19)
+ CharSoundWindow=GemRB.LoadWindow(19)
VoiceList = CharSoundWindow.GetControl (45)
VoiceList.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
diff --git a/gemrb/GUIScripts/bg2/GUICG2.py b/gemrb/GUIScripts/bg2/GUICG2.py
index 12ca441..f620e46 100644
--- a/gemrb/GUIScripts/bg2/GUICG2.py
+++ b/gemrb/GUIScripts/bg2/GUICG2.py
@@ -29,7 +29,7 @@ def OnLoad():
global ClassWindow, TextAreaControl, DoneButton, MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- ClassWindow = GemRB.LoadWindowObject(2)
+ ClassWindow = GemRB.LoadWindow(2)
MyChar = GemRB.GetVar ("Slot")
Race = RaceTable.FindValue (3, GemRB.GetPlayerStat (MyChar, IE_RACE) )
diff --git a/gemrb/GUIScripts/bg2/GUICG22.py b/gemrb/GUIScripts/bg2/GUICG22.py
index d4bb5b8..5a445ad 100644
--- a/gemrb/GUIScripts/bg2/GUICG22.py
+++ b/gemrb/GUIScripts/bg2/GUICG22.py
@@ -55,7 +55,7 @@ def OnLoad():
#there is a specialist mage window, but it is easier to use
#the class kit window for both
- KitWindow = GemRB.LoadWindowObject(22)
+ KitWindow = GemRB.LoadWindow(22)
if ClassID == 1:
Label = KitWindow.GetControl(0xfffffff)
Label.SetText(595)
diff --git a/gemrb/GUIScripts/bg2/GUICG23.py b/gemrb/GUIScripts/bg2/GUICG23.py
index 0eac4f7..ec1cf48 100644
--- a/gemrb/GUIScripts/bg2/GUICG23.py
+++ b/gemrb/GUIScripts/bg2/GUICG23.py
@@ -26,7 +26,7 @@ def OnLoad ():
global BioWindow, EditControl
GemRB.LoadWindowPack ("GUICG", 640, 480)
- BioWindow = GemRB.LoadWindowObject (23)
+ BioWindow = GemRB.LoadWindow (23)
EditControl = BioWindow.GetControl (3)
BIO = GemRB.GetToken("BIO")
diff --git a/gemrb/GUIScripts/bg2/GUICG24.py b/gemrb/GUIScripts/bg2/GUICG24.py
index 954f24b..eb15f13 100644
--- a/gemrb/GUIScripts/bg2/GUICG24.py
+++ b/gemrb/GUIScripts/bg2/GUICG24.py
@@ -25,7 +25,7 @@ def OnLoad():
global ImportWindow
GemRB.LoadWindowPack("GUICG", 640, 480)
- ImportWindow = GemRB.LoadWindowObject(24)
+ ImportWindow = GemRB.LoadWindow(24)
TextAreaControl = ImportWindow.GetControl(0)
TextAreaControl.SetText(53605)
diff --git a/gemrb/GUIScripts/bg2/GUICG3.py b/gemrb/GUIScripts/bg2/GUICG3.py
index b0ee7b8..3ad1d96 100644
--- a/gemrb/GUIScripts/bg2/GUICG3.py
+++ b/gemrb/GUIScripts/bg2/GUICG3.py
@@ -44,7 +44,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG", 640, 480)
AlignmentTable = GemRB.LoadTable("aligns")
- AlignmentWindow = GemRB.LoadWindowObject(3)
+ AlignmentWindow = GemRB.LoadWindow(3)
for i in range(9):
Button = AlignmentWindow.GetControl(i+2)
diff --git a/gemrb/GUIScripts/bg2/GUICG4.py b/gemrb/GUIScripts/bg2/GUICG4.py
index c2ddfd6..807ce9a 100644
--- a/gemrb/GUIScripts/bg2/GUICG4.py
+++ b/gemrb/GUIScripts/bg2/GUICG4.py
@@ -133,7 +133,7 @@ def OnLoad():
GemRB.LoadWindowPack("GUICG", 640, 480)
AbilityTable = GemRB.LoadTable("ability")
- AbilityWindow = GemRB.LoadWindowObject(4)
+ AbilityWindow = GemRB.LoadWindow(4)
RerollButton = AbilityWindow.GetControl(2)
RerollButton.SetText(11982)
diff --git a/gemrb/GUIScripts/bg2/GUICG5.py b/gemrb/GUIScripts/bg2/GUICG5.py
index 5fc1407..6e0a2b9 100644
--- a/gemrb/GUIScripts/bg2/GUICG5.py
+++ b/gemrb/GUIScripts/bg2/GUICG5.py
@@ -27,7 +27,7 @@ def OnLoad():
global NameWindow, NameField, DoneButton
GemRB.LoadWindowPack("GUICG", 640, 480)
- NameWindow = GemRB.LoadWindowObject(5)
+ NameWindow = GemRB.LoadWindow(5)
BackButton = NameWindow.GetControl(3)
BackButton.SetText(15416)
diff --git a/gemrb/GUIScripts/bg2/GUICG6.py b/gemrb/GUIScripts/bg2/GUICG6.py
index 3afa7c0..55dcb2b 100644
--- a/gemrb/GUIScripts/bg2/GUICG6.py
+++ b/gemrb/GUIScripts/bg2/GUICG6.py
@@ -37,7 +37,7 @@ def OnLoad():
global SkillWindow, DoneButton, MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- SkillWindow = GemRB.LoadWindowObject(6)
+ SkillWindow = GemRB.LoadWindow(6)
MyChar = GemRB.GetVar ("Slot")
Levels = [GemRB.GetPlayerStat (MyChar, IE_LEVEL), \
diff --git a/gemrb/GUIScripts/bg2/GUICG8.py b/gemrb/GUIScripts/bg2/GUICG8.py
index ac370c1..db96c79 100644
--- a/gemrb/GUIScripts/bg2/GUICG8.py
+++ b/gemrb/GUIScripts/bg2/GUICG8.py
@@ -29,7 +29,7 @@ def OnLoad():
global RaceWindow, TextAreaControl, DoneButton, MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- RaceWindow = GemRB.LoadWindowObject(8)
+ RaceWindow = GemRB.LoadWindow(8)
MyChar = GemRB.GetVar ("Slot")
RaceCount = RaceTable.GetRowCount()
diff --git a/gemrb/GUIScripts/bg2/GUICG9.py b/gemrb/GUIScripts/bg2/GUICG9.py
index b8b08b1..56644a3 100644
--- a/gemrb/GUIScripts/bg2/GUICG9.py
+++ b/gemrb/GUIScripts/bg2/GUICG9.py
@@ -36,7 +36,7 @@ def OnLoad():
global SkillWindow, DoneButton, MyChar
GemRB.LoadWindowPack("GUICG", 640, 480)
- SkillWindow = GemRB.LoadWindowObject(9)
+ SkillWindow = GemRB.LoadWindow(9)
MyChar = GemRB.GetVar ("Slot")
Levels = [GemRB.GetPlayerStat (MyChar, IE_LEVEL), GemRB.GetPlayerStat (MyChar, IE_LEVEL2), \
GemRB.GetPlayerStat (MyChar, IE_LEVEL3)]
diff --git a/gemrb/GUIScripts/bg2/GUICommonWindows.py b/gemrb/GUIScripts/bg2/GUICommonWindows.py
index 4dfdd12..be14452 100644
--- a/gemrb/GUIScripts/bg2/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg2/GUICommonWindows.py
@@ -472,7 +472,7 @@ def RunSelectionChangeHandler ():
def OpenPortraitWindow (needcontrols):
global PortraitWindow
- PortraitWindow = Window = GemRB.LoadWindowObject (1)
+ PortraitWindow = Window = GemRB.LoadWindow (1)
if needcontrols:
Button=Window.GetControl (8)
@@ -736,7 +736,7 @@ def OpenWaitForDiscWindow ():
pass
GemRB.LoadWindowPack ("GUIID")
- DiscWindow = Window = GemRB.LoadWindowObject (0)
+ DiscWindow = Window = GemRB.LoadWindow (0)
GemRB.SetVar ("OtherWindow", Window.ID)
label = DiscWindow.GetControl (0)
diff --git a/gemrb/GUIScripts/bg2/GUIINV.py b/gemrb/GUIScripts/bg2/GUIINV.py
index d85024b..7731c42 100644
--- a/gemrb/GUIScripts/bg2/GUIINV.py
+++ b/gemrb/GUIScripts/bg2/GUIINV.py
@@ -92,11 +92,11 @@ def OpenInventoryWindow ():
GameWindow.SetVisible(WINDOW_INVISIBLE)
GemRB.LoadWindowPack ("GUIINV", 640, 480)
- InventoryWindow = Window = GemRB.LoadWindowObject (2)
+ InventoryWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", InventoryWindow.ID)
GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID )
OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindowObject (0)
+ OptionsWindow = GemRB.LoadWindow (0)
MarkMenuButton (OptionsWindow)
SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow")
OptionsWindow.SetFrame ()
@@ -219,7 +219,7 @@ def GetColor ():
ColorTable = GemRB.LoadTable ("clowncol")
InventoryWindow.SetVisible (WINDOW_GRAYED) #darken it
- ColorPicker=GemRB.LoadWindowObject (3)
+ ColorPicker=GemRB.LoadWindow (3)
GemRB.SetVar ("Selected",-1)
for i in range (34):
Button = ColorPicker.GetControl (i)
@@ -599,7 +599,7 @@ def OpenItemAmountWindow ():
UpdateSlot (pc, slot-1)
return
- ItemAmountWindow = Window = GemRB.LoadWindowObject (4)
+ ItemAmountWindow = Window = GemRB.LoadWindow (4)
# item icon
Icon = Window.GetControl (0)
Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET)
@@ -659,7 +659,7 @@ def OpenErrorWindow (strref):
global ErrorWindow
pc = GemRB.GameGetSelectedPCSingle (...
[truncated message content] |