Home / Browse / GemRB Game Engine / Mail / Archive

GemRB Game Engine

Email Archive: gemrb-commits (read-only)

2003:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (559)	_Nov (772)	_Dec (914)
2004:	_Jan (291)	_Feb (312)	_Mar (215)	_Apr (243)	_May (150)	_Jun (18)	_Jul (131)	_Aug (436)	_Sep (171)	_Oct (233)	_Nov (222)	_Dec (141)
2005:	_Jan (74)	_Feb (220)	_Mar (326)	_Apr (142)	_May (165)	_Jun (187)	_Jul (246)	_Aug (116)	_Sep (10)	_Oct (30)	_Nov (257)	_Dec (247)
2006:	_Jan (165)	_Feb (38)	_Mar (58)	_Apr (135)	_May (18)	_Jun (102)	_Jul (228)	_Aug (250)	_Sep (47)	_Oct (26)	_Nov (69)	_Dec (263)
2007:	_Jan (120)	_Feb (268)	_Mar (50)	_Apr (64)	_May (49)	_Jun (39)	_Jul (22)	_Aug (56)	_Sep (9)	_Oct (2)	_Nov (47)	_Dec (115)
2008:	_Jan (57)	_Feb (81)	_Mar (26)	_Apr (10)	_May (19)	_Jun (69)	_Jul (10)	_Aug (6)	_Sep (111)	_Oct (105)	_Nov (11)	_Dec (19)
2009:	_Jan (92)	_Feb (159)	_Mar (86)	_Apr (59)	_May (320)	_Jun (443)	_Jul (103)	_Aug (315)	_Sep (221)	_Oct (122)	_Nov (13)	_Dec (46)
2010:	_Jan (6)	_Feb (1)	_Mar (65)	_Apr (100)	_May (76)	_Jun (171)	_Jul (145)	_Aug (223)	_Sep (107)	_Oct (89)	_Nov (123)	_Dec (86)
2011:	_Jan (66)	_Feb (101)	_Mar (140)	_Apr (80)	_May (68)	_Jun (45)	_Jul (97)	_Aug (119)	_Sep (46)	_Oct (45)	_Nov (74)	_Dec (89)
2012:	_Jan (124)	_Feb (156)	_Mar (102)	_Apr (56)	_May (25)	_Jun (16)	_Jul (73)	_Aug (82)	_Sep (53)	_Oct (59)	_Nov (90)	_Dec (112)
2013:	_Jan (191)	_Feb (58)	_Mar (68)	_Apr (49)	_May (10)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Gemrb-commits] SF.net SVN: gemrb:[5236] gemrb/trunk/gemrb/GUIScripts/bg1

From: <lynxlupodian@us...> - 2008-07-21 09:54

Revision: 5236
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5236&view=rev
Author:   lynxlupodian
Date:     2008-07-21 09:53:02 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
[ 1883628 ] Improve GuiScripts of BG1
committed the last patch by zefklop

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -45,7 +45,7 @@
 	# Return to Game
 	Button = GemRB.GetControl (Window, 0)
 	GemRB.SetTooltip (Window, Button, 16313)
-	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame)
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -23,11 +23,15 @@
 
 ###################################################
 import GemRB
+import GUICommonWindows
 from GUIDefines import *
 from GUICommon import CloseOtherWindow
+from GUICommonWindows import *
 
 ###################################################
 JournalWindow = None
+OldOptionsWindow = None
+OverSlot = None
 Chapter = 0
 StartTime = 0
 StartYear = 0
@@ -35,7 +39,8 @@
 ###################################################
 def OpenJournalWindow ():
 	global StartTime, StartYear
-	global JournalWindow
+	global JournalWindow, OptionsWindow, PortraitWindow
+	global OldOptionsWindow
 
 	Table = GemRB.LoadTable("YEARS")
 	#StartTime is the time offset for ingame time, beginning from the startyear
@@ -45,18 +50,28 @@
 	GemRB.UnloadTable(Table)
 
 	if CloseOtherWindow (OpenJournalWindow):
-		GemRB.HideGUI ()
 		GemRB.UnloadWindow (JournalWindow)
+		GemRB.UnloadWindow (OptionsWindow)
+		
 		JournalWindow = None
 		GemRB.SetVar ("OtherWindow", -1)
-		
+		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 		return
 		
 	GemRB.HideGUI ()
-	GemRB.LoadWindowPack ("GUIJRNL")
+	GemRB.SetVisible (0,0)
+	
+	GemRB.LoadWindowPack ("GUIJRNL", 640, 480)
 	JournalWindow = Window = GemRB.LoadWindow (2)
 	GemRB.SetVar("OtherWindow", JournalWindow)
+	OldOptionsWindow = OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "OpenJournalWindow")
+	#saving the original portrait window
+	GemRB.SetWindowFrame (OptionsWindow)
 
 	
 	Button = GemRB.GetControl (Window, 3)
@@ -66,8 +81,13 @@
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "JournalNextSectionPress")
 
 	Chapter = GemRB.GetGameVar("chapter")
+	GemRB.SetVar("TopIndex", 0)
+	SetSelectionChangeHandler (UpdateJournalWindow)
 	UpdateJournalWindow ()
-	GemRB.UnhideGUI ()
+	
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
 
 
 ###################################################

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -32,18 +32,22 @@
 MapWindow = None
 WorldMapWindow = None
 WorldMapControl = None
+OldOptionsWindow = None
 
 def RevealMap ():
-	global MapWindow
+	global MapWindow, OldOptionsWindow
 
 	if CloseOtherWindow (ShowMap):
 		GemRB.UnloadWindow (MapWindow)
+		GemRB.UnloadWindow (OptionsWindow) ;
 
 		MapWindow = None
 		#this window type should block the game
 		GemRB.SetVar ("OtherWindow", -1)
 		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		GUICommonWindows.OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 
 	PosX = GemRB.GetVar ("MapControlX")
 	PosY = GemRB.GetVar ("MapControlY")
@@ -55,16 +59,20 @@
 # for farsight effect
 ###################################################
 def ShowMap ():
-	global MapWindow
+	global MapWindow, OptionsWindow, PortraitWindow
+	global OldOptionsWindow
 
 	if CloseOtherWindow (ShowMap):
 		GemRB.UnloadWindow (MapWindow)
+		GemRB.UnloadWindow (OptionsWindow)
 
 		MapWindow = None
 		#this window type should block the game
 		GemRB.SetVar ("OtherWindow", -1)
 		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		GUICommonWindows.OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 		return
 
 	GemRB.HideGUI ()
@@ -75,74 +83,82 @@
 	#this window type blocks the game normally, but map window doesn't
 	GemRB.SetVar ("OtherWindow", MapWindow)
 	#saving the original portrait window
-	GemRB.SetWindowFrame (MapWindow)
+	OldOptionsWindow = GUICommonWindows.OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "ShowMap")
+	GemRB.SetWindowFrame (OptionsWindow)
 
 	# World Map
 	Button = GemRB.GetControl (Window, 1)
 	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
 
-	# Hide or Show mapnotes
-	Button = GemRB.GetControl (Window, 3)
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
-
-	Label = GemRB.GetControl (Window, 0x10000003)
-	GemRB.SetText (Window, Label, "")
 	# Map Control
 	GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1")
 	Map = GemRB.GetControl (Window, 2)
-	GemRB.SetVar("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP)
-	GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP)
 	GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
 	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 2)
+	GemRB.SetVisible (OptionsWindow, 3)
+	GemRB.SetVisible (Window, 3)
+	GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
 	GemRB.GamePause (0,0)
 	return
 
 ###################################################
 def OpenMapWindow ():
-	global MapWindow
+	global MapWindow, OptionsWindow, OldOptionsWindow, PortraitWindow
 
 	if CloseOtherWindow (OpenMapWindow):
-		if WorldMapWindow: OpenWorldMapWindowInside ()
+		GemRB.UnloadWindow (MapWindow)
+		GemRB.UnloadWindow (OptionsWindow)
 
-		GemRB.HideGUI ()
-		GemRB.UnloadWindow (MapWindow)
 		MapWindow = None
-		GemRB.SetVar ("OtherWindow", -1)
-		GemRB.UnhideGUI ()
-		return
+		#this window type should block the game
+ 		GemRB.SetVar ("OtherWindow", -1)
+		GemRB.SetVisible (0,1)
+ 		GemRB.UnhideGUI ()
+		GUICommonWindows.OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
+ 		return
 
 	GemRB.HideGUI ()
-	GemRB.LoadWindowPack ("GUIMAP")
+	GemRB.SetVisible (0,0)
+
+	GemRB.LoadWindowPack ("GUIMAP", 640, 480)
 	MapWindow = Window = GemRB.LoadWindow (2)
+	#this window type blocks the game normally, but map window doesn't
 	GemRB.SetVar ("OtherWindow", MapWindow)
+	#saving the original portrait window
+	OldOptionsWindow = GUICommonWindows.OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "OpenMapWindow")
+	OldPortraitWindow = GUICommonWindows.PortraitWindow
+	PortraitWindow = OpenPortraitWindow (0)
+	GemRB.SetWindowFrame (OptionsWindow)
 
 	# World Map
 	Button = GemRB.GetControl (Window, 1)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindowInside")
 
 	# Map Control
-	GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0)
+	GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1")
 	Map = GemRB.GetControl (Window, 2)
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
 
-	GemRB.UnhideGUI ()
 
 def LeftDoublePressMap ():
 	print "MoveToPoint"
 	return
 
-def LeftPressMap ():
-	print "MoveRectangle"
-	return
-
-def AddNoteWindow ():
-	print "Add Note"
-	return
-
 def OpenWorldMapWindowInside ():
 	WorldMapWindowCommon (-1)
 	return
 
 def OpenWorldMapWindow ():
+	OpenMapWindow() #closes MapWindow
 	WorldMapWindowCommon (GemRB.GetVar ("Travel"))
 	return
 
@@ -192,9 +208,9 @@
 	GemRB.HideGUI ()
 	GemRB.SetVisible (0,0)
 
-	GemRB.LoadWindowPack ("GUIWMAP")
+	GemRB.LoadWindowPack ("GUIWMAP", 640, 480)
 	WorldMapWindow = Window = GemRB.LoadWindow (0)
-	MapWindow = None
+	GemRB.SetWindowFrame (Window)
 
 	GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel, "floattxt")
 	WorldMapControl = GemRB.GetControl (Window, 4)

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -24,34 +24,43 @@
 ###################################################
 
 import GemRB
+import GUICommonWindows
 from GUIDefines import *
 from ie_stats import *
 from GUICommon import CloseOtherWindow
-from GUICommonWindows import SetSelectionChangeHandler
+from GUICommonWindows import *
 
 MageWindow = None
 MageSpellInfoWindow = None
 MageSpellLevel = 0
 MageSpellUnmemorizeWindow = None
+OldOptionsWindow = None
 
 
 def OpenMageWindow ():
-	global MageWindow
+	global MageWindow, OptionsWindow, PortraitWindow
+	global OldOptionsWindow
 
 	if CloseOtherWindow (OpenMageWindow):
-		GemRB.HideGUI ()
 		GemRB.UnloadWindow (MageWindow)
+		GemRB.UnloadWindow (OptionsWindow)
 		MageWindow = None
 		GemRB.SetVar ("OtherWindow", -1)
-		
-		SetSelectionChangeHandler (None)
+		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 		return
 		
 	GemRB.HideGUI ()
+	GemRB.SetVisible (0,0)
 	GemRB.LoadWindowPack ("GUIMG")
 	MageWindow = Window = GemRB.LoadWindow (2)
 	GemRB.SetVar ("OtherWindow", MageWindow)
+	OldOptionsWindow = GUICommonWindows.OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "OpenMageWindow")
+	GemRB.SetWindowFrame (OptionsWindow)
 	
 	Button = GemRB.GetControl (Window, 1)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MagePrevLevelPress")
@@ -92,7 +101,10 @@
 	SetSelectionChangeHandler (UpdateMageWindow)
 	UpdateMageWindow ()
 
-	GemRB.UnhideGUI ()	
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
+	return
 
 
 def UpdateMageWindow ():

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -35,15 +35,17 @@
 
 ###################################################
 import GemRB
+import GUICommonWindows
 from GUIDefines import *
 from GUICommon import CloseOtherWindow
 from GUISAVE import *
-from GUICommonWindows import SetSelectionChangeHandler
+from GUICommonWindows import *
  
 ###################################################
 SubOptionsWindow = None
 SubSubOptionsWindow = None
 GameOptionsWindow = None
+OldOptionsWindow = None
 MoviesWindow = None
 KeysWindow = None
 HelpTextArea = None
@@ -55,17 +57,21 @@
 
 
 def CloseOptionsWindow ():
-	global GameOptionsWindow
+	global GameOptionsWindow, OptionsWindow
+	global OldOptionsWindow
 
 	if GameOptionsWindow == None:
 		return
 
 	GemRB.UnloadWindow (GameOptionsWindow)
+	GemRB.UnloadWindow (OptionsWindow)
 
 	GameOptionsWindow = None
 	SetSelectionChangeHandler (None)
 	GemRB.SetVar ("OtherWindow", -1)
 	GemRB.SetVisible (0,1)
+	OptionsWindow = OldOptionsWindow
+	OldOptionsWindow = None
 	return
 
 def DummyWindow ():
@@ -74,7 +80,8 @@
 ###################################################
 def OpenOptionsWindow ():
 	"""Open main options window"""
-	global GameOptionsWindow, hideflag
+	global GameOptionsWindow, OptionsWindow, PortraitWindow
+	global OldOptionsWindow
 
 	if CloseOtherWindow(OpenOptionsWindow):
 		CloseOptionsWindow()
@@ -84,11 +91,15 @@
 	GemRB.SetVisible (0,0)
 	SetSelectionChangeHandler (DummyWindow)
 
-	GemRB.LoadWindowPack ("GUIOPT")
+	GemRB.LoadWindowPack ("GUIOPT", 640, 480)
 	GameOptionsWindow = Window = GemRB.LoadWindow (2)
 	GemRB.SetVar ("OtherWindow", GameOptionsWindow)
+	if OldOptionsWindow == None:
+		OldOptionsWindow = OptionsWindow
+		OptionsWindow = GemRB.LoadWindow (0)
+		SetupMenuWindowControls (OptionsWindow, 0, "OpenOptionsWindow")
+		GemRB.SetWindowFrame (OptionsWindow)
 
-
 	# Load game
 	Button = GemRB.GetControl (Window, 5)
 	GemRB.SetText (Window, Button, 13729)
@@ -128,7 +139,10 @@
 	# game version, e.g. v1.1.0000
 	Label = GemRB.GetControl (Window, 0x1000000b)
 	GemRB.SetText (Window, Label, GEMRB_VERSION)
+
+	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
 	return
 
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -24,35 +24,45 @@
 ###################################################
 
 import GemRB
+import GUICommonWindows
 from GUIDefines import *
 from ie_stats import *
 from GUICommon import CloseOtherWindow
-from GUICommonWindows import SetSelectionChangeHandler
+from GUICommonWindows import *
 
 PriestWindow = None
 PriestSpellInfoWindow = None
 PriestSpellLevel = 0
 PriestSpellUnmemorizeWindow = None
+OldOptionsWindow = None
 
 
 def OpenPriestWindow ():
-	global PriestWindow
+	global PriestWindow, PortraitWindow, OptionsWindow
+	global OldOptionsWindow
 
 
 	if CloseOtherWindow (OpenPriestWindow):
-		GemRB.HideGUI ()
 		GemRB.UnloadWindow (PriestWindow)
+		GemRB.UnloadWindow (OptionsWindow)
 		PriestWindow = None
 		GemRB.SetVar ("OtherWindow", -1)
-
-		SetSelectionChangeHandler (None)
+		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 		return
 
 	GemRB.HideGUI ()
+	GemRB.SetVisible (0,0)
+	
 	GemRB.LoadWindowPack ("GUIPR")
 	PriestWindow = Window = GemRB.LoadWindow (2)
 	GemRB.SetVar ("OtherWindow", PriestWindow)
+	OldOptionsWindow = GUICommonWindows.OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "OpenPriestWindow")
+	GemRB.SetWindowFrame (OptionsWindow)
 
 	Button = GemRB.GetControl (Window, 1)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PriestPrevLevelPress")
@@ -87,7 +97,10 @@
 	SetSelectionChangeHandler (UpdatePriestWindow)
 	UpdatePriestWindow ()
 
-	GemRB.UnhideGUI ()
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
+	return
 
 
 def UpdatePriestWindow ():
@@ -98,9 +111,9 @@
 
 	Window = PriestWindow
 	pc = GemRB.GameGetSelectedPCSingle ()
-	type = IE_SPELL_TYPE_PRIEST
+	Type = IE_SPELL_TYPE_PRIEST
 	level = PriestSpellLevel
-	max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
+	max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, Type, level)
 
 	Label = GemRB.GetControl (Window, 0x10000032)
 	GemRB.SetToken ('LEVEL', str (level + 1))
@@ -110,11 +123,11 @@
 	Label = GemRB.GetControl (Window, 0x10000035)
 	GemRB.SetText (Window, Label, Name)
 
-	mem_cnt = GemRB.GetMemorizedSpellsCount (pc, type, level)
+	mem_cnt = GemRB.GetMemorizedSpellsCount (pc, Type, level)
 	for i in range (12):
 		Button = GemRB.GetControl (Window, 3 + i)
 		if i < mem_cnt:
-			ms = GemRB.GetMemorizedSpell (pc, type, level, i)
+			ms = GemRB.GetMemorizedSpell (pc, Type, level, i)
 			GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'])
 			GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
 			GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
@@ -139,11 +152,11 @@
 			GemRB.EnableButtonBorder (Window, Button, 0, 0)
 
 
-	known_cnt = GemRB.GetKnownSpellsCount (pc, type, level)
+	known_cnt = GemRB.GetKnownSpellsCount (pc, Type, level)
 	for i in range (20):
 		Button = GemRB.GetControl (Window, 27 + i)
 		if i < known_cnt:
-			ks = GemRB.GetKnownSpell (pc, type, level, i)
+			ks = GemRB.GetKnownSpell (pc, Type, level, i)
 			GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'])
 			GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
 			GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell")
@@ -162,10 +175,10 @@
 			GemRB.EnableButtonBorder (Window, Button, 0, 0)
 
 	Table = GemRB.LoadTable ("clskills")
-	if (GemRB.GetTableValue (Table, GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 1)=="*"):
-		GemRB.SetVisible (Window, 2)
-	else:
-		GemRB.SetVisible (Window, 1)
+	#if (GemRB.GetTableValue (Table, GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 1)=="*"):
+	#	GemRB.SetVisible (Window, 2)
+	#else:
+	GemRB.SetVisible (Window, 1)
 	return
 
 def PriestPrevLevelPress ():
@@ -232,11 +245,11 @@
 def OnPriestMemorizeSpell ():
 	pc = GemRB.GameGetSelectedPCSingle ()
 	level = PriestSpellLevel
-	type = IE_SPELL_TYPE_PRIEST
+	Type = IE_SPELL_TYPE_PRIEST
 
 	index = GemRB.GetVar ("SpellButton") - 100
 
-	if GemRB.MemorizeSpell (pc, type, level, index):
+	if GemRB.MemorizeSpell (pc, Type, level, index):
 		UpdatePriestWindow ()
 	return
 
@@ -297,11 +310,11 @@
 
 	pc = GemRB.GameGetSelectedPCSingle ()
 	level = PriestSpellLevel
-	type = IE_SPELL_TYPE_PRIEST
+	Type = IE_SPELL_TYPE_PRIEST
 
 	index = GemRB.GetVar ("SpellButton")
 
-	if GemRB.UnmemorizeSpell (pc, type, level, index):
+	if GemRB.UnmemorizeSpell (pc, Type, level, index):
 		UpdatePriestWindow ()
 	return
 
@@ -311,12 +324,12 @@
 
 	pc = GemRB.GameGetSelectedPCSingle ()
 	level = PriestSpellLevel
-	type = IE_SPELL_TYPE_PRIEST
+	Type = IE_SPELL_TYPE_PRIEST
 
 	index = GemRB.GetVar ("SpellButton")-100
 
 	#remove spell from memory
-	GemRB.RemoveSpell (pc, type, level, index)
+	GemRB.RemoveSpell (pc, Type, level, index)
 	UpdatePriestWindow ()
 	return
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -35,27 +35,37 @@
 RecordsWindow = None
 InformationWindow = None
 BiographyWindow = None
+OldOptionsWindow = None
 
 ###################################################
 def OpenRecordsWindow ():
-	global RecordsWindow
+	global RecordsWindow, OptionsWindow, PortraitWindow
+	global OldOptionsWindow
 
 	if CloseOtherWindow (OpenRecordsWindow):
 		if InformationWindow: OpenInformationWindow ()
-	
-		GemRB.HideGUI ()
+
+                
 		GemRB.UnloadWindow (RecordsWindow)
+		GemRB.UnloadWindow (OptionsWindow)
 		RecordsWindow = None
 		GemRB.SetVar ("OtherWindow", -1)
-		SetSelectionChangeHandler (None)
-	
+		GemRB.SetVisible (0,1)
 		GemRB.UnhideGUI ()
+		OptionsWindow = OldOptionsWindow
+		OldOptionsWindow = None
 		return
 
 	GemRB.HideGUI ()
+	GemRB.SetVisible (0,0)
+	
 	GemRB.LoadWindowPack ("GUIREC")
 	RecordsWindow = Window = GemRB.LoadWindow (2)
 	GemRB.SetVar ("OtherWindow", RecordsWindow)
+	OldOptionsWindow = GUICommonWindows.OptionsWindow
+	OptionsWindow = GemRB.LoadWindow (0)
+	SetupMenuWindowControls (OptionsWindow, 0, "OpenRecordsWindow")
+	GemRB.SetWindowFrame (OptionsWindow)
 
 	# dual class
 	Button = GemRB.GetControl (Window, 0)
@@ -95,7 +105,9 @@
 	SetSelectionChangeHandler (UpdateRecordsWindow)
 	UpdateRecordsWindow ()
 
-	GemRB.UnhideGUI ()
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (Window, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
 	return
 
 def GetNextLevelExp (Level, Class):
@@ -431,22 +443,13 @@
 def OpenInformationWindow ():
 	global InformationWindow
 
-	GemRB.HideGUI ()
-
 	if InformationWindow != None:
 		if BiographyWindow: OpenBiographyWindow ()
 
-		GemRB.UnloadWindow (InformationWindow)
-		InformationWindow = None
-		GemRB.SetVar ("FloatWindow", -1)
-	
-		GemRB.UnhideGUI()
 		return
 
 	InformationWindow = Window = GemRB.LoadWindow (4)
-	GemRB.SetVar ("FloatWindow", InformationWindow)
 
-
 	# Biography
 	Button = GemRB.GetControl (Window, 26)
 	GemRB.SetText (Window, Button, 18003)
@@ -455,24 +458,25 @@
 	# Done
 	Button = GemRB.GetControl (Window, 24)
 	GemRB.SetText (Window, Button, 11973)
-	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInformationWindow")
+	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseInformationWindow")
 
-	GemRB.UnhideGUI ()
 	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
 	return
 
+def CloseInformationWindow ():
+        global InformationWindow
+
+        GemRB.UnloadWindow (InformationWindow)
+	InformationWindow = None
+	GemRB.SetVisible (OptionsWindow, 1)
+	GemRB.SetVisible (RecordsWindow, 1)
+	GemRB.SetVisible (PortraitWindow, 1)
+	return
+
 def OpenBiographyWindow ():
 	global BiographyWindow
 
-	GemRB.HideGUI ()
-
 	if BiographyWindow != None:
-		GemRB.UnloadWindow (BiographyWindow)
-		BiographyWindow = None
-		GemRB.SetVar ("FloatWindow", InformationWindow)
-	
-		GemRB.UnhideGUI()
-		GemRB.ShowModal (InformationWindow, MODAL_SHADOW_GRAY)
 		return
 
 	BiographyWindow = Window = GemRB.LoadWindow (12)
@@ -484,12 +488,19 @@
 	# Done
 	Button = GemRB.GetControl (Window, 2)
 	GemRB.SetText (Window, Button, 11973)
-	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow")
+	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseBiographyWindow")
 
-	GemRB.UnhideGUI ()
 	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
 	return
 
+def CloseBiographyWindow ():
+        global BiographyWindow
+
+        GemRB.UnloadWindow (BiographyWindow)
+	BiographyWindow = None
+	GemRB.SetVisible (InformationWindow, 1)
+	return
+
 def OpenExportWindow ():
 	global ExportWindow, NameField, ExportDoneButton
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2008-07-19 17:10:43 UTC (rev 5235)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2008-07-21 09:53:02 UTC (rev 5236)
@@ -397,16 +397,21 @@
 	return
 
 def OpenReformPartyWindow ():
-	global ReformPartyWindow
+	global ReformPartyWindow, OldActionsWindow, OldMessageWindow
 
 	GemRB.SetVar ("Selected", 0)
 	hideflag = GemRB.HideGUI ()
 
 	if ReformPartyWindow:
 		GemRB.UnloadWindow (ReformPartyWindow)
+		GemRB.SetVar ("ActionsWindow", OldActionsWindow)
+		GemRB.SetVar ("MessageWindow", OldMessageWindow)
+		GemRB.SetVar ("OtherWindow", -1)
+
+		OldActionsWindow = None
+		OldMessageWindow = None
 		ReformPartyWindow = None
 
-		GemRB.SetVar ("OtherWindow", -1)
 		#GemRB.LoadWindowPack ("GUIREC")
 		if hideflag:
 			GemRB.UnhideGUI ()
@@ -438,7 +443,11 @@
 	Button = GemRB.GetControl (Window, 8)
 	GemRB.SetText (Window, Button, 11973)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenReformPartyWindow")
+
+	OldActionsWindow = GemRB.GetVar ("ActionsWindow")
+	OldMessageWindow = GemRB.GetVar ("MessageWindow")
 	GemRB.SetVar ("ActionsWindow", -1)
+	GemRB.SetVar ("MessageWindow", -1)
 	UpdateReformWindow ()
 	if hideflag:
 		GemRB.UnhideGUI ()
@@ -505,3 +514,4 @@
 	#default
 	return "GUIW"
 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[5292] gemrb/trunk/gemrb/GUIScripts/bg1

From: <avenger_teambg@us...> - 2008-09-14 15:44

Revision: 5292
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5292&view=rev
Author:   avenger_teambg
Date:     2008-09-14 15:45:01 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
fixed some problems and added mousewheel feature (used zefklop's patch #2109514)

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -45,7 +45,7 @@
 	# Return to Game
 	Button = GemRB.GetControl (Window, 0)
 	GemRB.SetTooltip (Window, Button, 16313)
-	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame)
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -39,7 +39,7 @@
 ###################################################
 def OpenJournalWindow ():
 	global StartTime, StartYear
-	global JournalWindow, OptionsWindow, PortraitWindow
+	global JournalWindow, OptionsWindow
 	global OldOptionsWindow
 
 	Table = GemRB.LoadTable("YEARS")
@@ -87,7 +87,7 @@
 	
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 
 
 ###################################################

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -59,7 +59,7 @@
 # for farsight effect
 ###################################################
 def ShowMap ():
-	global MapWindow, OptionsWindow, PortraitWindow
+	global MapWindow, OptionsWindow
 	global OldOptionsWindow
 
 	if CloseOtherWindow (ShowMap):
@@ -97,7 +97,7 @@
 	Map = GemRB.GetControl (Window, 2)
 	GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 2)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 2)
 	GemRB.SetVisible (OptionsWindow, 3)
 	GemRB.SetVisible (Window, 3)
 	GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -38,7 +38,7 @@
 
 
 def OpenMageWindow ():
-	global MageWindow, OptionsWindow, PortraitWindow
+	global MageWindow, OptionsWindow
 	global OldOptionsWindow
 
 	if CloseOtherWindow (OpenMageWindow):
@@ -103,7 +103,7 @@
 
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 	return
 
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -80,7 +80,7 @@
 ###################################################
 def OpenOptionsWindow ():
 	"""Open main options window"""
-	global GameOptionsWindow, OptionsWindow, PortraitWindow
+	global GameOptionsWindow, OptionsWindow
 	global OldOptionsWindow
 
 	if CloseOtherWindow(OpenOptionsWindow):
@@ -142,7 +142,7 @@
 
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 	return
 
 
@@ -535,7 +535,7 @@
 
 	GemRB.UnloadWindow (LoadMsgWindow)
 	LoadMsgWindow = None
-	GemRB.SetVisible (OptionsWindow, 1)
+	#GemRB.SetVisible (OptionsWindow, 1)
 	return
 
 def LoadGamePress ():

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -38,7 +38,7 @@
 
 
 def OpenPriestWindow ():
-	global PriestWindow, PortraitWindow, OptionsWindow
+	global PriestWindow, OptionsWindow
 	global OldOptionsWindow
 
 
@@ -99,7 +99,7 @@
 
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 	return
 
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -36,10 +36,11 @@
 InformationWindow = None
 BiographyWindow = None
 OldOptionsWindow = None
+OptionsWindow = None
 
 ###################################################
 def OpenRecordsWindow ():
-	global RecordsWindow, OptionsWindow, PortraitWindow
+	global RecordsWindow, OptionsWindow
 	global OldOptionsWindow
 
 	if CloseOtherWindow (OpenRecordsWindow):
@@ -107,7 +108,7 @@
 
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (Window, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 	return
 
 def GetNextLevelExp (Level, Class):
@@ -470,7 +471,7 @@
 	InformationWindow = None
 	GemRB.SetVisible (OptionsWindow, 1)
 	GemRB.SetVisible (RecordsWindow, 1)
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 	return
 
 def OpenBiographyWindow ():

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -35,7 +35,7 @@
 StoreWindow = None
 MessageWindow = None
 ActionWindow = None
-PortraitWindow = None
+#PortraitWindow = None
 StoreShoppingWindow = None
 StoreIdentifyWindow = None
 StoreStealWindow = None
@@ -43,7 +43,7 @@
 StoreHealWindow = None
 StoreRumourWindow = None
 StoreRentWindow = None
-OldPortraitWindow = None
+#OldPortraitWindow = None
 RentConfirmWindow = None
 LeftButton = None
 RightButton = None
@@ -93,17 +93,17 @@
 
 
 def CloseStoreWindow ():
-	global StoreWindow, ActionWindow, PortraitWindow
-	global OldPortraitWindow
+	global StoreWindow, ActionWindow #, PortraitWindow
+	#global OldPortraitWindow
 
 	GemRB.SetVar ("Inventory", 0)
 	CloseWindows ()
 	GemRB.UnloadWindow (StoreWindow)
 	GemRB.UnloadWindow (ActionWindow)
-	GemRB.UnloadWindow (PortraitWindow)
+	#GemRB.UnloadWindow (PortraitWindow)
 	StoreWindow = None
 	GemRB.LeaveStore ()
-	GUICommonWindows.PortraitWindow = OldPortraitWindow
+	#GUICommonWindows.PortraitWindow = OldPortraitWindow
 	if Inventory:
 		GemRB.RunEventHandler("OpenInventoryWindow")
 	else:
@@ -114,8 +114,8 @@
 
 def OpenStoreWindow ():
 	global Store
-	global StoreWindow, ActionWindow, PortraitWindow
-	global OldPortraitWindow
+	global StoreWindow, ActionWindow #, PortraitWindow
+	#global OldPortraitWindow
 	global store_update_funcs
 	global Inventory
 
@@ -138,8 +138,8 @@
 	GemRB.LoadWindowPack ("GUISTORE", 640, 480)
 	StoreWindow = Window = GemRB.LoadWindow (3)
 	#saving the original portrait window
-	OldPortraitWindow = GUICommonWindows.PortraitWindow
-	PortraitWindow = OpenPortraitWindow (0)
+	#OldPortraitWindow = GUICommonWindows.PortraitWindow
+	#PortraitWindow = OpenPortraitWindow (0)
 	ActionWindow = GemRB.LoadWindow (0)
 	#this window is static and grey, but good to stick the frame onto
 	GemRB.SetWindowFrame (ActionWindow)
@@ -177,7 +177,7 @@
 	GemRB.SetVisible (ActionWindow, 1)
 	GemRB.SetVisible (Window, 1)
 	store_update_funcs[store_buttons[0]] ()
-	GemRB.SetVisible (PortraitWindow, 1)
+	GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
 
 
 def OpenStoreShoppingWindow ():
@@ -196,16 +196,26 @@
 	Label = GemRB.GetControl (Window, 0x1000002c)
 	GemRB.SetText (Window, Label, "0")
 
+	# left scrollbar
+	ScrollBarLeft = GemRB.GetControl (Window, 11)
+	GemRB.SetEvent (Window, ScrollBarLeft, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
+
+	# right scrollbar
+	ScrollBarRight = GemRB.GetControl (Window, 12)
+	GemRB.SetEvent (Window, ScrollBarRight, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
+
 	for i in range(4):
 		Button = GemRB.GetControl (Window, i+5)
 		GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectBuy")
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoLeftWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBarLeft)
 
 		Button = GemRB.GetControl (Window, i+13)
 		GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectSell")
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBarRight)
 
 	# Buy
 	LeftButton = Button = GemRB.GetControl (Window, 2)
@@ -230,14 +240,6 @@
 	Label = GemRB.CreateLabel (Window, 0x10000043, 15,325,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
 	Label = GemRB.CreateLabel (Window, 0x10000044, 15,365,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
 
-	# left scrollbar
-	ScrollBar = GemRB.GetControl (Window, 11)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
-
-	# right scrollbar
-	ScrollBar = GemRB.GetControl (Window, 12)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
-
 	SetSelectionChangeHandler( UpdateStoreShoppingWindow )
 	UpdateStoreShoppingWindow ()
 	GemRB.SetVisible (Window, 1)
@@ -263,16 +265,17 @@
 	Label = GemRB.GetControl (Window, 0x10000003)
 	GemRB.SetText (Window, Label, "0")
 
+	ScrollBar = GemRB.GetControl (Window, 7)
+	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreIdentifyWindow")
+
 	# 8-11 item slots, 0x1000000c-f labels
 	for i in range(4):
 		Button = GemRB.GetControl (Window, i+8)
 		GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreIdentifyWindow")
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoIdentifyWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBar)
 
-	ScrollBar = GemRB.GetControl (Window, 7)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreIdentifyWindow")
-
 	SetSelectionChangeHandler( UpdateStoreIdentifyWindow )
 	UpdateStoreIdentifyWindow ()
 	GemRB.SetVisible (Window, 1)
@@ -289,14 +292,24 @@
 
 	StoreStealWindow = Window = GemRB.LoadWindow (6)
 
+	# left scrollbar
+	ScrollBarLeft = GemRB.GetControl (Window, 9)
+	GemRB.SetEvent (Window, ScrollBarLeft, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
+
+	# right scrollbar
+	ScrollBarRight = GemRB.GetControl (Window, 10)
+	GemRB.SetEvent (Window, ScrollBarRight, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
+
 	for i in range(4):
 		Button = GemRB.GetControl (Window, i+4)
 		GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreStealWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBarLeft)
 
 		Button = GemRB.GetControl (Window, i+11)
 		GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBarRight)
 
 	# Steal
 	LeftButton = Button = GemRB.GetControl (Window, 1)
@@ -310,14 +323,6 @@
 	Label = GemRB.CreateLabel (Window, 0x10000043, 15,325,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
 	Label = GemRB.CreateLabel (Window, 0x10000044, 15,365,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
 
-	# left scrollbar
-	ScrollBar = GemRB.GetControl (Window, 9)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
-
-	# right scrollbar
-	ScrollBar = GemRB.GetControl (Window, 10)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
-
 	SetSelectionChangeHandler( UpdateStoreStealWindow )
 	UpdateStoreStealWindow ()
 	GemRB.SetVisible (Window, 1)
@@ -368,12 +373,16 @@
 
 	StoreHealWindow = Window = GemRB.LoadWindow (5)
 
+	ScrollBar = GemRB.GetControl (Window, 7)
+	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreHealWindow")
+
 	#spell buttons
 	for i in range(4):
 		Button = GemRB.GetControl (Window, i+8)
 		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "UpdateStoreHealWindow")
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoHealWindow")
+		GemRB.AttachScrollBar(Window, Button, ScrollBar)
 
 	# price tag
 	Label = GemRB.GetControl (Window, 0x10000003)
@@ -385,8 +394,6 @@
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyHeal")
 	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
 
-	ScrollBar = GemRB.GetControl (Window, 7)
-	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreHealWindow")
 	Count = Store['StoreCureCount']
 	if Count>4:
 		Count = Count-4

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2008-09-14 15:45:01 UTC (rev 5292)
@@ -25,6 +25,7 @@
 
 import GemRB
 from GUIDefines import *
+from ie_restype import *
 from GUICommon import CloseOtherWindow
 from GUICommonWindows import *
 
@@ -504,13 +505,16 @@
 	return
 
 def GetWindowPack():
+	ret = "GUIW"
 	width = GemRB.GetSystemVariable (SV_WIDTH)
 	if width == 800:
-		return "GUIW08"
+		ret = "GUIW08"
 	if width == 1024:
-		return "GUIW10"
+		ret = "GUIW10"
 	if width == 1280:
-		return "GUIW12"
+		ret = "GUIW12"
+	if GemRB.HasResource (ret, RES_CHU):
+		return ret
 	#default
 	return "GUIW"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[5483] gemrb/trunk/gemrb/GUIScripts/bg1

From: <avenger_teambg@us...> - 2008-11-11 17:40

Revision: 5483
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5483&view=rev
Author:   avenger_teambg
Date:     2008-11-11 17:40:35 +0000 (Tue, 11 Nov 2008)

Log Message:
-----------
applied patch #2263333 from Whiteclone

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-11-09 19:42:27 UTC (rev 5482)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-11-11 17:40:35 UTC (rev 5483)
@@ -47,6 +47,8 @@
 	Button = GemRB.GetControl (Window, 0)
 	GemRB.SetTooltip (Window, Button, 16313)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	# enabled BAM isn't present in .chu, defining it here
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,16,17,28,16)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame)
 
@@ -54,6 +56,7 @@
 	Button = GemRB.GetControl (Window, 1)
 	GemRB.SetTooltip (Window, Button, 16310)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,0,1,20,0)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 1)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
 
@@ -61,6 +64,7 @@
 	Button = GemRB.GetControl (Window, 2)
 	GemRB.SetTooltip (Window, Button, 16308)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,4,5,22,4)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 2)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
 
@@ -68,6 +72,7 @@
 	Button = GemRB.GetControl (Window, 3)
 	GemRB.SetTooltip (Window, Button, 16307)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,2,3,21,2)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 3)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInventoryWindow")
 
@@ -75,6 +80,7 @@
 	Button = GemRB.GetControl (Window, 4)
 	GemRB.SetTooltip (Window, Button, 16306)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,6,7,23,6)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 4)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenRecordsWindow")
 
@@ -82,12 +88,15 @@
 	Button = GemRB.GetControl (Window, 5)
 	GemRB.SetTooltip (Window, Button, 16309)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,8,9,24,8)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 5)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageWindow")
+
 	# Priest
 	Button = GemRB.GetControl (Window, 6)
 	GemRB.SetTooltip (Window, Button, 14930)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,10,11,25,10)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 6)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestWindow")
 
@@ -95,6 +104,7 @@
 	Button = GemRB.GetControl (Window, 7)
 	GemRB.SetTooltip (Window, Button, 16311)
 	#GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+	GemRB.SetButtonSprites (Window, Button, "GUILSOP", 0,12,13,26,12)
 	GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 7)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow")
 
@@ -115,8 +125,24 @@
 		SetGamedaysAndHourToken()
 		GemRB.SetTooltip(Window, Button, 16041)
 
+	MarkMenuButton (Window)
+
 	return
 
+def MarkMenuButton (WindowIndex):
+	Pressed = GemRB.GetVar ("SelectedWindow")
+
+	for button in range (9):
+		Button = GemRB.GetControl (WindowIndex, button)
+		GemRB.SetButtonState (WindowIndex, Button, IE_GUI_BUTTON_ENABLED)
+
+	if Pressed:
+		Button = Pressed
+	else: # highlight return to game
+		Button = GemRB.GetControl (WindowIndex, 0)
+
+	GemRB.SetButtonState (WindowIndex, Button, IE_GUI_BUTTON_SELECTED)
+
 def AIPress ():
 	Button = GemRB.GetControl (PortraitWindow, 6)
 	AI = GemRB.GetMessageWindowSize () & GS_PARTYAI
@@ -497,12 +523,18 @@
 		Button = GemRB.GetControl (Window, 7)
 		GemRB.SetTooltip (Window, Button, 10485)
 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress")
+
 	pc = GemRB.GameGetSelectedPCSingle ()
 	Inventory = GemRB.GetVar ("Inventory")
 
+	if Inventory:
+		# Ensure that inventory button is highlighted if pressed
+		GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 3)
+
 	for i in range (PARTY_SIZE):
 		Button = GemRB.GetControl (Window, i)
 		GemRB.SetVarAssoc (Window, Button, "PressedPortrait", i)
+
 		if (needcontrols):
 			GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenInventoryWindowClick")
 		else:

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py	2008-11-09 19:42:27 UTC (rev 5482)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py	2008-11-11 17:40:35 UTC (rev 5483)
@@ -124,20 +124,22 @@
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_DRAG_DROP, "OnAutoEquip")
 
 	#encumbrance
-	Label = GemRB.CreateLabel (Window, 0x10000043, 5,385,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
-	Label = GemRB.CreateLabel (Window, 0x10000044, 5,455,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
+	Label = GemRB.CreateLabel (Window, 0x10000043, 14,375,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
+	Label = GemRB.CreateLabel (Window, 0x10000044, 8,445,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
+	#Label = GemRB.CreateLabel (Window, 0x10000043, 5,385,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
+	#Label = GemRB.CreateLabel (Window, 0x10000044, 5,455,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
 
 	#armor class
 	Label = GemRB.GetControl (Window, 0x10000038)
-	GemRB.SetTooltip (Window, Label, 4197)
+	GemRB.SetTooltip (Window, Label, 17183)
 
 	#hp current
 	Label = GemRB.GetControl (Window, 0x10000039)
-	GemRB.SetTooltip (Window, Label, 4198)
+	GemRB.SetTooltip (Window, Label, 17184)
 
 	#hp max
 	Label = GemRB.GetControl (Window, 0x1000003a)
-	GemRB.SetTooltip (Window, Label, 4199)
+	GemRB.SetTooltip (Window, Label, 17378)
 
 	#info label, game paused, etc
 	Label = GemRB.GetControl (Window, 0x1000003f)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[5613] gemrb/trunk/gemrb/GUIScripts/bg1

From: <wjpalenstijn@us...> - 2009-02-01 22:33

Revision: 5613
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5613&view=rev
Author:   wjpalenstijn
Date:     2009-02-01 22:05:31 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
use classes in BG1 GUIScripts

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMOVIE.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
    gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py
    gemrb/trunk/gemrb/GUIScripts/bg1/LoadScreen.py
    gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py
    gemrb/trunk/gemrb/GUIScripts/bg1/Start.py
    gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -15,84 +15,87 @@
 	GemRB.SetVar("Alignment",0) #alignment
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 
-	InfoAreaControl = GemRB.GetControl(CharGenWindow, 9)
-	GemRB.SetText(CharGenWindow, InfoAreaControl, 16575)
+	InfoAreaControl = CharGenWindow.GetControl(9)
+	InfoAreaControl.SetText(16575)
 	
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,GenderButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_ENABLED)
+	GenderButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
 	# this button does nothing when you click it at this stage:
-	# GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, GenderButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	# BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	GenderButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.SetButtonState(CharGenWindow, ImportButton, IE_GUI_BUTTON_DISABLED)
-	GemRB.SetButtonState(CharGenWindow, CancelButton, IE_GUI_BUTTON_DISABLED)
+	ImportButton.SetState(IE_GUI_BUTTON_DISABLED)
+	CancelButton.SetState(IE_GUI_BUTTON_DISABLED)
 	GemRB.DrawWindows()   #needed to redraw the windows NOW
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG1") #gender
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("Start")
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -10,93 +10,97 @@
 	GemRB.SetVar("Race",0) #race
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,RaceButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_ENABLED)
+	RaceButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	#GemRB.SetText(CharGenWindow, BackButton, 15416)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	#BackButton.SetText(15416)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
+		TextAreaControl.Append(1051)
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, RaceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	RaceButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG8") #race
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen") #appearance
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen2")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -11,98 +11,102 @@
 	#GemRB.SetVar("Class Kit",0) #class kit
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
+	RaceTable = GemRB.LoadTableObject("races")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,ClassButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_ENABLED)
+	ClassButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	#GemRB.SetText(CharGenWindow, BackButton, 15416)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	#BackButton.SetText(15416)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, ClassButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	ClassButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG2") #class
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen2") #appearance
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen3")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -10,110 +10,114 @@
 	GemRB.SetVar("Alignment",-1) #alignment
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
-	ClassTable = GemRB.LoadTable("classes")
-	KitTable = GemRB.LoadTable("kitlist")
+	RaceTable = GemRB.LoadTableObject("races")
+	ClassTable = GemRB.LoadTableObject("classes")
+	KitTable = GemRB.LoadTableObject("kitlist")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,AlignmentButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_ENABLED)
+	AlignmentButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	#GemRB.SetText(CharGenWindow, BackButton, 15416)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	#BackButton.SetText(15416)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	#BiographyButton = GemRB.GetControl(CharGenWindow, 16)
-	#GemRB.SetText(CharGenWindow, BiographyButton, 18003)
-	#GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	#BiographyButton = CharGenWindow.GetControl(16)
+	#BiographyButton.SetText(18003)
+	#BiographyButton.SetState(IE_GUI_BUTTON_DISABLED)
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
+	TextAreaControl.Append(12136, -1)
+	TextAreaControl.Append(": ")
 	KitIndex = GemRB.GetVar("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
+		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
+		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	AlignmentButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG3") #alignment
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen3") #appearance
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen4")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -11,114 +11,118 @@
 		GemRB.SetVar("Ability "+str(i),0) #abilities
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
-	ClassTable = GemRB.LoadTable("classes")
-	KitTable = GemRB.LoadTable("kitlist")
-	AlignmentTable = GemRB.LoadTable("aligns")
+	RaceTable = GemRB.LoadTableObject("races")
+	ClassTable = GemRB.LoadTableObject("classes")
+	KitTable = GemRB.LoadTableObject("kitlist")
+	AlignmentTable = GemRB.LoadTableObject("aligns")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,AbilitiesButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_ENABLED)
+	AbilitiesButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	#GemRB.SetText(CharGenWindow, BackButton, 15416)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	#BackButton.SetText(15416)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	#BiographyButton = GemRB.GetControl(CharGenWindow, 16)
-	#GemRB.SetText(CharGenWindow, BiographyButton, 18003)
-	#GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	#BiographyButton = CharGenWindow.GetControl(16)
+	#BiographyButton.SetText(18003)
+	#BiographyButton.SetState(IE_GUI_BUTTON_DISABLED)
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
+	TextAreaControl.Append(12136, -1)
+	TextAreaControl.Append(": ")
 	KitIndex = GemRB.GetVar("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
+		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1049, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
+	TextAreaControl.Append(1049, -1)
+	TextAreaControl.Append(": ")
+	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
+	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	AbilitiesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG4") #abilities
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen4") #alignment
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen5")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -13,116 +13,120 @@
 		GemRB.SetVar("Prof "+str(i),0)  #proficiencies
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
-	ClassTable = GemRB.LoadTable("classes")
-	KitTable = GemRB.LoadTable("kitlist")
-	AlignmentTable = GemRB.LoadTable("aligns")
-	AbilityTable = GemRB.LoadTable("ability")
+	RaceTable = GemRB.LoadTableObject("races")
+	ClassTable = GemRB.LoadTableObject("classes")
+	KitTable = GemRB.LoadTableObject("kitlist")
+	AlignmentTable = GemRB.LoadTableObject("aligns")
+	AbilityTable = GemRB.LoadTableObject("ability")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,SkillButton,IE_GUI_BUTTON_DEFAULT,OP_OR) 
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_ENABLED)
+	SkillButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) 
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
+	TextAreaControl.Append(12136, -1)
+	TextAreaControl.Append(": ")
 	KitIndex = GemRB.GetVar("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
+		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1049, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
+		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
+	TextAreaControl.Append(1049, -1)
+	TextAreaControl.Append(": ")
+	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
+	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
 	for i in range(6):
-		v = GemRB.GetTableValue(AbilityTable, i,2)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, v, -1)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
+		v = AbilityTable.GetValue(i,2)
+		TextAreaControl.Append(v, -1)
+		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, SkillButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	SkillButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG15") #skills (haterace)
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen5") #abilities
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen6")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -8,116 +8,120 @@
 	global CharGenWindow, TextAreaControl
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
-	ClassTable = GemRB.LoadTable("classes")
-	KitTable = GemRB.LoadTable("kitlist")
-	AlignmentTable = GemRB.LoadTable("aligns")
-	AbilityTable = GemRB.LoadTable("ability")
+	RaceTable = GemRB.LoadTableObject("races")
+	ClassTable = GemRB.LoadTableObject("classes")
+	KitTable = GemRB.LoadTableObject("kitlist")
+	AlignmentTable = GemRB.LoadTableObject("aligns")
+	AbilityTable = GemRB.LoadTableObject("ability")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,AppearanceButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_ENABLED)
+	AppearanceButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
+	TextAreaControl.Append(12136, -1)
+	TextAreaControl.Append(": ")
 	KitIndex = GemRB.GetVar("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
+		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1049, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
+		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
+	TextAreaControl.Append(1049, -1)
+	TextAreaControl.Append(": ")
+	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
+	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
 	for i in range(6):
-		v = GemRB.GetTableValue(AbilityTable, i,2)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, v, -1)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
+		v = AbilityTable.GetValue(i,2)
+		TextAreaControl.Append(v, -1)
+		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	AppearanceButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG13") #colors
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen6") #skills
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen7")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -8,116 +8,120 @@
 	global CharGenWindow, TextAreaControl
 
 	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindow(0)
-	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject(0)
+	PortraitButton = CharGenWindow.GetControl(12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable("races")
-	ClassTable = GemRB.LoadTable("classes")
-	KitTable = GemRB.LoadTable("kitlist")
-	AlignmentTable = GemRB.LoadTable("aligns")
-	AbilityTable = GemRB.LoadTable("ability")
+	RaceTable = GemRB.LoadTableObject("races")
+	ClassTable = GemRB.LoadTableObject("classes")
+	KitTable = GemRB.LoadTableObject("kitlist")
+	AlignmentTable = GemRB.LoadTableObject("aligns")
+	AbilityTable = GemRB.LoadTableObject("ability")
 
-	GenderButton = GemRB.GetControl(CharGenWindow,0)
-	GemRB.SetText(CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState(CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl(0)
+	GenderButton.SetText(11956)
+	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl(CharGenWindow,1)
-	GemRB.SetText(CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl(1)
+	RaceButton.SetText(11957)
+	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl(CharGenWindow,2)
-	GemRB.SetText(CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl(2)
+	ClassButton.SetText(11959)
+	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
-	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl(3)
+	AlignmentButton.SetText(11958)
+	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
-	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl(4)
+	AbilitiesButton.SetText(11960)
+	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl(CharGenWindow,5)
-	GemRB.SetText(CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl(5)
+	SkillButton.SetText(17372)
+	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
-	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl(6)
+	AppearanceButton.SetText(11961)
+	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl(CharGenWindow,7)
-	GemRB.SetText(CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,NameButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	NameButton = CharGenWindow.GetControl(7)
+	NameButton.SetText(11963)
+	NameButton.SetState(IE_GUI_BUTTON_ENABLED)
+	NameButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	BackButton = GemRB.GetControl(CharGenWindow, 11)
-	GemRB.SetButtonState(CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl(11)
+	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl(CharGenWindow, 8)
-	GemRB.SetText(CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
+	AcceptButton = CharGenWindow.GetControl(8)
+	AcceptButton.SetText(11962)
+	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	ImportButton = GemRB.GetControl(CharGenWindow, 13)
-	GemRB.SetText(CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl(13)
+	ImportButton.SetText(13955)
+	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl(CharGenWindow, 15)
-	GemRB.SetText(CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl(15)
+	CancelButton.SetText(13727)
+	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl(CharGenWindow,9)
-	GemRB.SetText(CharGenWindow, TextAreaControl, 12135)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+	TextAreaControl= CharGenWindow.GetControl(9)
+	TextAreaControl.SetText(12135)
+	TextAreaControl.Append(": ")
 	if GemRB.GetVar("Gender") == 1:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append(1050)
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append(1051)
+	TextAreaControl.Append(1048,-1) # new line
+	TextAreaControl.Append(": ")
+	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
+	TextAreaControl.Append(12136, -1)
+	TextAreaControl.Append(": ")
 	KitIndex = GemRB.GetVar("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
+		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,1049, -1)
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
-	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
-	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
+		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
+	TextAreaControl.Append(1049, -1)
+	TextAreaControl.Append(": ")
+	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
+	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
 	for i in range(6):
-		v = GemRB.GetTableValue(AbilityTable, i,2)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, v, -1)
-		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
+		v = AbilityTable.GetValue(i,2)
+		TextAreaControl.Append(v, -1)
+		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
 
-	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent(CharGenWindow, NameButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent(CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible(CharGenWindow,1)
+	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	NameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible(1)
 	return
 	
 def NextPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("GUICG5") #name
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetNextScript("CharGen7") #appearance
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow(CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload()
 	GemRB.SetToken("NextScript","CharGen8")
 	GemRB.SetNextScript("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -11,123 +11,124 @@
 	global CharGenWindow, TextAreaControl, PortraitName
 
 	GemRB.LoadWindowPack ("GUICG", 640, 480)
-	CharGenWindow = GemRB.LoadWindow (0)
-	PortraitButton = GemRB.GetControl (CharGenWindow, 12)
-	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	CharGenWindow = GemRB.LoadWindowObject (0)
+	PortraitButton = CharGenWindow.GetControl (12)
+	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 	PortraitName = GemRB.GetToken ("LargePortrait")
-	GemRB.SetButtonPicture (CharGenWindow,PortraitButton,PortraitName,"NOPORTLG")
+	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
 
-	RaceTable = GemRB.LoadTable ("races")
-	ClassTable = GemRB.LoadTable ("classes")
-	KitTable = GemRB.LoadTable ("kitlist")
-	AlignmentTable = GemRB.LoadTable ("aligns")
-	AbilityTable = GemRB.LoadTable ("ability")
+	RaceTable = GemRB.LoadTableObject ("races")
+	ClassTable = GemRB.LoadTableObject ("classes")
+	KitTable = GemRB.LoadTableObject ("kitlist")
+	AlignmentTable = GemRB.LoadTableObject ("aligns")
+	AbilityTable = GemRB.LoadTableObject ("ability")
 
-	GenderButton = GemRB.GetControl (CharGenWindow,0)
-	GemRB.SetText (CharGenWindow,GenderButton,11956)
-	GemRB.SetButtonState (CharGenWindow,GenderButton,IE_GUI_BUTTON_DISABLED)
+	GenderButton = CharGenWindow.GetControl (0)
+	GenderButton.SetText (11956)
+	GenderButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	RaceButton = GemRB.GetControl (CharGenWindow,1)
-	GemRB.SetText (CharGenWindow,RaceButton, 11957)
-	GemRB.SetButtonState (CharGenWindow,RaceButton,IE_GUI_BUTTON_DISABLED)
+	RaceButton = CharGenWindow.GetControl (1)
+	RaceButton.SetText (11957)
+	RaceButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	ClassButton = GemRB.GetControl (CharGenWindow,2)
-	GemRB.SetText (CharGenWindow,ClassButton, 11959)
-	GemRB.SetButtonState (CharGenWindow,ClassButton,IE_GUI_BUTTON_DISABLED)
+	ClassButton = CharGenWindow.GetControl (2)
+	ClassButton.SetText (11959)
+	ClassButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	AlignmentButton = GemRB.GetControl (CharGenWindow,3)
-	GemRB.SetText (CharGenWindow,AlignmentButton, 11958)
-	GemRB.SetButtonState (CharGenWindow,AlignmentButton,IE_GUI_BUTTON_DISABLED)
+	AlignmentButton = CharGenWindow.GetControl (3)
+	AlignmentButton.SetText (11958)
+	AlignmentButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	AbilitiesButton = GemRB.GetControl (CharGenWindow,4)
-	GemRB.SetText (CharGenWindow,AbilitiesButton, 11960)
-	GemRB.SetButtonState (CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_DISABLED)
+	AbilitiesButton = CharGenWindow.GetControl (4)
+	AbilitiesButton.SetText (11960)
+	AbilitiesButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	SkillButton = GemRB.GetControl (CharGenWindow,5)
-	GemRB.SetText (CharGenWindow,SkillButton, 17372)
-	GemRB.SetButtonState (CharGenWindow,SkillButton,IE_GUI_BUTTON_DISABLED)
+	SkillButton = CharGenWindow.GetControl (5)
+	SkillButton.SetText (17372)
+	SkillButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	AppearanceButton = GemRB.GetControl (CharGenWindow,6)
-	GemRB.SetText (CharGenWindow,AppearanceButton, 11961)
-	GemRB.SetButtonState (CharGenWindow,AppearanceButton,IE_GUI_BUTTON_DISABLED)
+	AppearanceButton = CharGenWindow.GetControl (6)
+	AppearanceButton.SetText (11961)
+	AppearanceButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	NameButton = GemRB.GetControl (CharGenWindow,7)
-	GemRB.SetText (CharGenWindow,NameButton, 11963)
-	GemRB.SetButtonState (CharGenWindow,NameButton,IE_GUI_BUTTON_DISABLED)
+	NameButton = CharGenWindow.GetControl (7)
+	NameButton.SetText (11963)
+	NameButton.SetState (IE_GUI_BUTTON_DISABLED)
 
-	BackButton = GemRB.GetControl (CharGenWindow, 11)
-	GemRB.SetButtonState (CharGenWindow,BackButton,IE_GUI_BUTTON_ENABLED)
+	BackButton = CharGenWindow.GetControl (11)
+	BackButton.SetState (IE_GUI_BUTTON_ENABLED)
 
-	AcceptButton = GemRB.GetControl (CharGenWindow, 8)
-	GemRB.SetText (CharGenWindow, AcceptButton, 11962)
-	GemRB.SetButtonState (CharGenWindow,AcceptButton,IE_GUI_BUTTON_ENABLED)
-	GemRB.SetButtonFlags(CharGenWindow,AcceptButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	AcceptButton = CharGenWindow.GetControl (8)
+	AcceptButton.SetText (11962)
+	AcceptButton.SetState (IE_GUI_BUTTON_ENABLED)
+	AcceptButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	ImportButton = GemRB.GetControl (CharGenWindow, 13)
-	GemRB.SetText (CharGenWindow, ImportButton, 13955)
-	GemRB.SetButtonState (CharGenWindow,ImportButton,IE_GUI_BUTTON_ENABLED)
+	ImportButton = CharGenWindow.GetControl (13)
+	ImportButton.SetText (13955)
+	ImportButton.SetState (IE_GUI_BUTTON_ENABLED)
 
-	CancelButton = GemRB.GetControl (CharGenWindow, 15)
-	GemRB.SetText (CharGenWindow, CancelButton, 13727)
-	GemRB.SetButtonState (CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
+	CancelButton = CharGenWindow.GetControl (15)
+	CancelButton.SetText (13727)
+	CancelButton.SetState (IE_GUI_BUTTON_ENABLED)
 
-	TextAreaControl= GemRB.GetControl (CharGenWindow,9)
+	TextAreaControl= CharGenWindow.GetControl (9)
 
-	GemRB.SetText (CharGenWindow, TextAreaControl, 1047)
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, ": ")
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, GemRB.GetToken ("CHARNAME") )
+	TextAreaControl.SetText (1047)
+	TextAreaControl.Append (": ")
+	TextAreaControl.Append (GemRB.GetToken ("CHARNAME") )
 
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, 12135, -1)
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,": ")
+	TextAreaControl.Append (12135, -1)
+	TextAreaControl.Append (": ")
 	if GemRB.GetVar ("Gender") == 1:
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, 1050)
+		TextAreaControl.Append (1050)
 	else:
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, 1051)
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,1048,-1) # new line
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,": ")
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,GemRB.GetTableValue (RaceTable,GemRB.GetVar ("Race")-1,2))
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,12136, -1)
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,": ")
+		TextAreaControl.Append (1051)
+	TextAreaControl.Append (1048,-1) # new line
+	TextAreaControl.Append (": ")
+	TextAreaControl.Append (RaceTable.GetValue (GemRB.GetVar ("Race")-1,2))
+	TextAreaControl.Append (12136, -1)
+	TextAreaControl.Append (": ")
 	KitIndex = GemRB.GetVar ("Class Kit")
 	if KitIndex == 0:
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,GemRB.GetTableValue (ClassTable,GemRB.GetVar ("Class")-1,2))
+		TextAreaControl.Append (ClassTable.GetValue (GemRB.GetVar ("Class")-1,2))
 	else:
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, GemRB.GetTableValue (KitTable, KitIndex,2) )
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,1049, -1)
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,": ")
-	v = GemRB.FindTableValue (AlignmentTable,3,GemRB.GetVar ("Alignment"))
-	GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,GemRB.GetTableValue (AlignmentTable,v,2))
+		TextAreaControl.Append (KitTable.GetValue (KitIndex,2) )
+	TextAreaControl.Append (1049, -1)
+	TextAreaControl.Append (": ")
+	v = AlignmentTable.FindValue (3,GemRB.GetVar ("Alignment"))
+	TextAreaControl.Append (AlignmentTable.GetValue (v,2))
 	for i in range(6):
-		v = GemRB.GetTableValue (AbilityTable, i,2)
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl, v, -1)
-		GemRB.TextAreaAppend (CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar ("Ability "+str(i))))
+		v = AbilityTable.GetValue (i,2)
+		TextAreaControl.Append (v, -1)
+		TextAreaControl.Append (": "+str(GemRB.GetVar ("Ability "+str(i))))
 
-	GemRB.SetEvent (CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GemRB.SetEvent (CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	GemRB.SetEvent (CharGenWindow, AcceptButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	GemRB.SetEvent (CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	GemRB.SetVisible (CharGenWindow,1)
+	CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+	BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress")
+	AcceptButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NextPress")
+	ImportButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+	CharGenWindow.SetVisible (1)
 	return
 
 def NextPress():
-	GemRB.UnloadWindow (CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload ()
 	#set my character up
 	MyChar = GemRB.GetVar ("Slot")
 	GemRB.CreatePlayer ("charbase", MyChar | 0x8000 )
 	GemRB.SetPlayerStat (MyChar, IE_SEX, GemRB.GetVar ("Gender") )
 	GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("Race") )
-	ClassTable = GemRB.LoadTable ("classes")
+	ClassTable = GemRB.LoadTableObject ("classes")
 	ClassIndex = GemRB.GetVar ("Class")-1
-	Class = GemRB.GetTableValue (ClassTable, ClassIndex, 5)
+	Class = ClassTable.GetValue (ClassIndex, 5)
 	GemRB.SetPlayerStat (MyChar, IE_CLASS, Class)
 	KitIndex = GemRB.GetVar ("Class Kit")
 	GemRB.SetPlayerStat (MyChar, IE_KIT, KitIndex)
 	t = GemRB.GetVar ("Alignment")
 	GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, t)
 
-	TmpTable = GemRB.LoadTable ("clskills")
+	TmpTable = GemRB.LoadTableObject ("clskills")
 	#mage spells
-	TableName = GemRB.GetTableValue (TmpTable, Class, 1, 0)
+	TableName = TmpTable.GetValue (Class, 1, 0)
 	if TableName != "*":
 		SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_WIZARD, 1)
 		Learnable = GetLearnableMageSpells( KitIndex, t, 1)
@@ -139,7 +140,7 @@
 			j=j<<1
 
 	#priest spells
-	TableName = GemRB.GetTableValue (TmpTable, Class, 1, 0)
+	TableName = TmpTable.GetValue (Class, 1, 0)
 	if TableName != "*":
 		SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_PRIEST, 1)
 		ClassFlag = 0 #set this according to class
@@ -147,36 +148,32 @@
 		for i in range(len(Learnable) ):
 			GemRB.LearnSpell (MyChar, Learnable[i], 0)
 
-	GemRB.UnloadTable (TmpTable)
-	TmpTable=GemRB.LoadTable ("repstart")
-	AlignmentTable = GemRB.LoadTable ("aligns")
-	t = GemRB.FindTableValue (AlignmentTable, 3, t)
-	t = GemRB.GetTableValue (TmpTable,t,0) * 10
+	TmpTable=GemRB.LoadTableObject ("repstart")
+	AlignmentTable = GemRB.LoadTableObject ("aligns")
+	t = AlignmentTable.FindValue (3, t)
+	t = TmpTable.GetValue (t,0) * 10
 	GemRB.SetPlayerStat (MyChar, IE_REPUTATION, t)
 
 	#slot 1 is the protagonist
 	if MyChar == 1:
 		GemRB.GameSetReputation( t )
 
-	TmpTable=GemRB.LoadTable ("strtgold")
-	t = GemRB.Roll (GemRB.GetTableValue (TmpTable,Class,1),GemRB.GetTableValue (TmpTable,Class,0), GemRB.GetTableValue (TmpTable,Class,2) )
-	GemRB.SetPlayerStat (MyChar, IE_GOLD, t*GemRB.GetTableValue (TmpTable,Class,3) )
-	GemRB.UnloadTable (TmpTable)
+	TmpTable=GemRB.LoadTableObject ("strtgold")
+	t = GemRB.Roll (TmpTable.GetValue (Class,1),TmpTable.GetValue (Class,0), TmpTable.GetValue (Class,2) )
+	GemRB.SetPlayerStat (MyChar, IE_GOLD, t*TmpTable.GetValue (Class,3) )
 
 	GemRB.SetPlayerStat (MyChar, IE_HATEDRACE, GemRB.GetVar ("HatedRace") )
-	TmpTable=GemRB.LoadTable ("ability")
-	AbilityCount = GemRB.GetTableRowCount (TmpTable)
+	TmpTable=GemRB.LoadTableObject ("ability")
+	AbilityCount = TmpTable.GetRowCount ()
 	for i in range(AbilityCount):
-		StatID=GemRB.GetTableValue (TmpTable, i,4)
+		StatID=TmpTable.GetValue (i,4)
 		GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Ability "+str(i) ) )
-	GemRB.UnloadTable (TmpTable)
 
-	TmpTable=GemRB.LoadTable ("weapprof")
-	ProfCount = GemRB.GetTableRowCount (TmpTable)
+	TmpTable=GemRB.LoadTableObject ("weapprof")
+	ProfCount = TmpTable.GetRowCount ()
 	for i in range(7,ProfCount):
-		StatID=GemRB.GetTableValue (TmpTable, i, 0)
+		StatID=TmpTable.GetValue (i, 0)
 		GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Prof "+str(i) ) )
-	GemRB.UnloadTable (TmpTable)
 
 	SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("HairColor") )
 	SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("SkinColor") )
@@ -200,14 +197,13 @@
 	GemRB.SetPlayerStat (MyChar, IE_CHR, GemRB.GetVar ("Ability 5"))
 
 	#setting skills (thieving/ranger)
-	TmpTable = GemRB.LoadTable ("skills")
-	RowCount = GemRB.GetTableRowCount (TmpTable)-2
+	TmpTable = GemRB.LoadTableObject ("skills")
+	RowCount = TmpTable.GetRowCount ()-2
 
 	for i in range(RowCount):
-		stat = GemRB.GetTableValue (TmpTable, i+2, 2)
+		stat = TmpTable.GetValue (i+2, 2)
 		value = GemRB.GetVar ("Skill "+str(i) )
 		GemRB.SetPlayerStat (MyChar, stat, value )
-	GemRB.UnloadTable (TmpTable)
 
 	GemRB.SetPlayerName (MyChar, GemRB.GetToken ("CHARNAME"), 0)
 	#does all the rest
@@ -223,22 +219,26 @@
 		GemRB.EnterGame()
 	else:
 		#leaving multi player pregen
-		GemRB.UnloadWindow (CharGenWindow)
+		if CharGenWindow:
+			CharGenWindow.Unload ()
 		GemRB.SetNextScript ("GUIMP")
 	return
 
 def CancelPress():
-	GemRB.UnloadWindow (CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload ()
 	GemRB.SetNextScript ("CharGen")
 	return
 
 def BackPress():
-	GemRB.UnloadWindow (CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload ()
 	GemRB.SetNextScript ("CharGen8") #name
 	return
 
 def ImportPress():
-	GemRB.UnloadWindow (CharGenWindow)
+	if CharGenWindow:
+		CharGenWindow.Unload ()
 	GemRB.SetToken ("NextScript","CharGen9")
 	GemRB.SetNextScript ("ImportFile") #import
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -10,64 +10,66 @@
 	
 	GemRB.LoadWindowPack("GUICG")
 	#this hack will redraw the base CG window
-	#GenderWindow = GemRB.LoadWindow(0)
-	#PortraitButton = GemRB.GetControl(GenderWindow, 12)
-	#GemRB.SetButtonFlags(GenderWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	#ImportButton = GemRB.GetControl(GenderWindow, 13)
-	#GemRB.SetText(GenderWindow, ImportButton, 13955)
-	#GemRB.SetButtonState(GenderWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
+	#GenderWindow = GemRB.LoadWindowObject(0)
+	#PortraitButton = GenderWindow.GetControl(12)
+	#PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	#ImportButton = GenderWindow.GetControl(13)
+	#ImportButton.SetText(13955)
+	#ImportButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	#CancelButton = GemRB.GetControl(GenderWindow, 15)
-	#GemRB.SetText(GenderWindow, CancelButton, 13727)
-	#GemRB.SetButtonState(GenderWindow,CancelButton,IE_GUI_BUTTON_DISABLED)
+	#CancelButton = GenderWindow.GetControl(15)
+	#CancelButton.SetText(13727)
+	#CancelButton.SetState(IE_GUI_BUTTON_DISABLED)
 
-	#GemRB.SetVisible(GenderWindow,1)
+	#GenderWindow.SetVisible(1)
 	#GemRB.DrawWindows()
 	#GemRB.UnloadWindow(GenderWindow)
-	GenderWindow = GemRB.LoadWindow(1)
+	GenderWindow = GemRB.LoadWindowObject(1)
 
-	BackButton = GemRB.GetControl(GenderWindow,6)
-	GemRB.SetText(GenderWindow,BackButton,15416)
-	DoneButton = GemRB.GetControl(GenderWindow,0)
-	GemRB.SetText(GenderWindow,DoneButton,11973)
-	GemRB.SetButtonFlags(GenderWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	BackButton = GenderWindow.GetControl(6)
+	BackButton.SetText(15416)
+	DoneButton = GenderWindow.GetControl(0)
+	DoneButton.SetText(11973)
+	DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	TextAreaControl = GemRB.GetControl(GenderWindow, 5)
-	GemRB.SetText(GenderWindow,TextAreaControl,17236)
+	TextAreaControl = GenderWindow.GetControl(5)
+	TextAreaControl.SetText(17236)
 
-	MaleButton = GemRB.GetControl(GenderWindow,2)
-	GemRB.SetButtonFlags(GenderWindow,MaleButton,IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
+	MaleButton = GenderWindow.GetControl(2)
+	MaleButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
 
-	FemaleButton = GemRB.GetControl(GenderWindow,3)
-	GemRB.SetButtonFlags(GenderWindow,FemaleButton,IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
+	FemaleButton = GenderWindow.GetControl(3)
+	FemaleButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
 
-	GemRB.SetVarAssoc(GenderWindow,MaleButton,"Gender",1)
-	GemRB.SetVarAssoc(GenderWindow,FemaleButton,"Gender",2)
-	GemRB.SetEvent(GenderWindow,MaleButton,IE_GUI_BUTTON_ON_PRESS,"ClickedMale")
-	GemRB.SetEvent(GenderWindow,FemaleButton,IE_GUI_BUTTON_ON_PRESS,"ClickedFemale")
-	GemRB.SetEvent(GenderWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
-	GemRB.SetEvent(GenderWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	GemRB.SetButtonState(GenderWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
-	GemRB.SetVisible(GenderWindow,1)
+	MaleButton.SetVarAssoc("Gender",1)
+	FemaleButton.SetVarAssoc("Gender",2)
+	MaleButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"ClickedMale")
+	FemaleButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"ClickedFemale")
+	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
+	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
+	GenderWindow.SetVisible(1)
 	return
 
 def ClickedMale():
-	GemRB.SetText(GenderWindow,TextAreaControl,13083)
-	GemRB.SetButtonState(GenderWindow,DoneButton,IE_GUI_BUTTON_ENABLED)
+	TextAreaControl.SetText(13083)
+	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
 def ClickedFemale():
-	GemRB.SetText(GenderWindow,TextAreaControl,13084)
-	GemRB.SetButtonState(GenderWindow,DoneButton,IE_GUI_BUTTON_ENABLED)
+	TextAreaControl.SetText(13084)
+	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
 def BackPress():
-	GemRB.UnloadWindow(GenderWindow)
+	if GenderWindow:
+		GenderWindow.Unload()
 	GemRB.SetNextScript("CharGen")
 	GemRB.SetVar("Gender",0)  #scrapping the gender value
 	return
 
 def NextPress():
-	GemRB.UnloadWindow(GenderWindow)
+	if GenderWindow:
+		GenderWindow.Unload()
 	GemRB.SetNextScript("GUICG12") 
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -11,70 +11,72 @@
 	global ClassTable
 	
 	GemRB.LoadWindowPack("GUICG")
-	ClassTable = GemRB.LoadTable("classes")
-	ClassCount = GemRB.GetTableRowCount(ClassTable)+1
-	ClassWindow = GemRB.LoadWindow(10)
-	TmpTable=GemRB.LoadTable("races")
-	RaceName = GemRB.GetTableRowName(TmpTable, GemRB.GetVar("Race")-1 )
+	ClassTable = GemRB.LoadTableObject("classes")
+	ClassCount = ClassTable.GetRowCount()+1
+	ClassWindow = GemRB.LoadWindowObject(10)
+	TmpTable=GemRB.LoadTableObject("races")
+	RaceName = TmpTable.GetRowName(GemRB.GetVar("Race")-1 )
 
 	j=0
 	for i in range(1,ClassCount):
-		if GemRB.GetTableValue(ClassTable,i-1,4)==0:
+		if ClassTable.GetValue(i-1,4)==0:
 			continue
 		if j>11:
-			Button = GemRB.GetControl(ClassWindow,j+7)
+			Button = ClassWindow.GetControl(j+7)
 		else:
-			Button = GemRB.GetControl(ClassWindow,j+2)
-		GemRB.SetButtonState(ClassWindow, Button, IE_GUI_BUTTON_DISABLED)
-		GemRB.SetButtonFlags(ClassWindow, Button, IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
+			Button = ClassWindow.GetControl(j+2)
+		Button.SetState(IE_GUI_BUTTON_DISABLED)
+		Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
 		j = j + 1
 	j=0
 	for i in range(1,ClassCount):
-		ClassName = GemRB.GetTableRowName(ClassTable, i-1)
-		Allowed = GemRB.GetTableValue(ClassTable, ClassName, RaceName)
-		if GemRB.GetTableValue(ClassTable,i-1,4)==0:
+		ClassName = ClassTable.GetRowName(i-1)
+		Allowed = ClassTable.GetValue(ClassName, RaceName)
+		if ClassTable.GetValue(i-1,4)==0:
 			continue
 		if j>11:
-			Button = GemRB.GetControl(ClassWindow,j+7)
+			Button = ClassWindow.GetControl(j+7)
 		else:
-			Button = GemRB.GetControl(ClassWindow,j+2)
+			Button = ClassWindow.GetControl(j+2)
 
-		t = GemRB.GetTableValue(ClassTable, i-1, 0)
-		GemRB.SetText(ClassWindow, Button, t )
+		t = ClassTable.GetValue(i-1, 0)
+		Button.SetText(t )
 		j=j+1
 		if Allowed ==0:
 			continue
-		GemRB.SetButtonState(ClassWindow, Button, IE_GUI_BUTTON_ENABLED)
-		GemRB.SetEvent(ClassWindow, Button, IE_GUI_BUTTON_ON_PRESS,  "ClassPress")
-		GemRB.SetVarAssoc(ClassWindow, Button , "Class", i) #multiclass, actually
+		Button.SetState(IE_GUI_BUTTON_ENABLED)
+		Button.SetEvent(IE_GUI_BUTTON_ON_PRESS,  "ClassPress")
+		Button.SetVarAssoc("Class", i) #multiclass, actually
 
-	BackButton = GemRB.GetControl(ClassWindow,14)
-	GemRB.SetText(ClassWindow,BackButton,15416)
-	DoneButton = GemRB.GetControl(ClassWindow,0)
-	GemRB.SetText(ClassWindow,DoneButton,11973)
+	BackButton = ClassWindow.GetControl(14)
+	BackButton.SetText(15416)
+	DoneButton = ClassWindow.GetControl(0)
+	DoneButton.SetText(11973)
 
-	TextAreaControl = GemRB.GetControl(ClassWindow, 12)
-	GemRB.SetText(ClassWindow,TextAreaControl,17244)
+	TextAreaControl = ClassWindow.GetControl(12)
+	TextAreaControl.SetText(17244)
 
-	GemRB.SetEvent(ClassWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
-	GemRB.SetEvent(ClassWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	GemRB.SetButtonState(ClassWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
-	GemRB.SetVisible(ClassWindow,1)
+	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
+	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
+	ClassWindow.SetVisible(1)
 	return
 
 def ClassPress():
 	Class = GemRB.GetVar("Class")-1
-	GemRB.SetText(ClassWindow,TextAreaControl, GemRB.GetTableValue(ClassTable,Class,1) )
-	GemRB.SetButtonState(ClassWindow, DoneButton, IE_GUI_BUTTON_ENABLED)
+	TextAreaControl.SetText(ClassTable.GetValue(Class,1) )
+	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
 def BackPress():
 	GemRB.SetVar("Class",0)  # scrapping it
-	GemRB.UnloadWindow(ClassWindow)
+	if ClassWindow:
+		ClassWindow.Unload()
 	GemRB.SetNextScript("GUICG2")
 	return
 
 def NextPress():
-	GemRB.UnloadWindow(ClassWindow)
+	if ClassWindow:
+		ClassWindow.Unload()
 	GemRB.SetNextScript("CharGen4") #alignment
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -11,8 +11,8 @@
 def SetPicture ():
 	global PortraitsTable, LastPortrait
 
-	PortraitName = GemRB.GetTableRowName (PortraitsTable, LastPortrait)+"G"
-	GemRB.SetButtonPicture (AppearanceWindow, PortraitButton, PortraitName)
+	PortraitName = PortraitsTable.GetRowName (LastPortrait)+"G"
+	PortraitButton.SetPicture (PortraitName)
 	return
 
 def OnLoad():
@@ -22,49 +22,49 @@
 	Gender=GemRB.GetVar ("Gender")
 
 	GemRB.LoadWindowPack("GUICG")
-	AppearanceWindow = GemRB.LoadWindow (11)
+	AppearanceWindow = GemRB.LoadWindowObject (11)
 
 	#Load the Portraits Table
-	PortraitsTable = GemRB.LoadTable ("PICTURES")
+	PortraitsTable = GemRB.LoadTableObject ("PICTURES")
 	LastPortrait = 0
 
-	PortraitButton = GemRB.GetControl (AppearanceWindow, 1)
-	GemRB.SetButtonFlags (AppearanceWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+	PortraitButton = AppearanceWindow.GetControl (1)
+	PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
 
-	LeftButton = GemRB.GetControl (AppearanceWindow,2)
-	RightButton = GemRB.GetControl (AppearanceWindow,3)
+	LeftButton = AppearanceWindow.GetControl (2)
+	RightButton = AppearanceWindow.GetControl (3)
 
-	BackButton = GemRB.GetControl (AppearanceWindow,5)
-	GemRB.SetText (AppearanceWindow,BackButton,15416)
+	BackButton = AppearanceWindow.GetControl (5)
+	BackButton.SetText (15416)
 
-	CustomButton = GemRB.GetControl (AppearanceWindow, 6)
-	GemRB.SetText (AppearanceWindow, CustomButton, 17545)
+	CustomButton = AppearanceWindow.GetControl (6)
+	CustomButton.SetText (17545)
 
-	DoneButton = GemRB.GetControl (AppearanceWindow,0)
-	GemRB.SetText (AppearanceWindow,DoneButton,11973)
-	GemRB.SetButtonFlags (AppearanceWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	DoneButton = AppearanceWindow.GetControl (0)
+	DoneButton.SetText (11973)
+	DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	GemRB.SetEvent (AppearanceWindow,RightButton,IE_GUI_BUTTON_ON_PRESS,"RightPress")
-	GemRB.SetEvent (AppearanceWindow,LeftButton,IE_GUI_BUTTON_ON_PRESS,"LeftPress")
-	GemRB.SetEvent (AppearanceWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	GemRB.SetEvent (AppearanceWindow,CustomButton,IE_GUI_BUTTON_ON_PRESS,"CustomPress")
-	GemRB.SetEvent (AppearanceWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
+	RightButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"RightPress")
+	LeftButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"LeftPress")
+	BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"BackPress")
+	CustomButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"CustomPress")
+	DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	
 	while True:
-		if GemRB.GetTableValue (PortraitsTable, LastPortrait, 0) == Gender:
+		if PortraitsTable.GetValue (LastPortrait, 0) == Gender:
 			SetPicture ()
 			break
 		LastPortrait = LastPortrait + 1
-	GemRB.SetVisible (AppearanceWindow,1)
+	AppearanceWindow.SetVisible (1)
 	return
 
 def RightPress():
 	global LastPortrait
 	while True:
 		LastPortrait = LastPortrait + 1
-		if LastPortrait >= GemRB.GetTableRowCount (PortraitsTable):
+		if LastPortrait >= PortraitsTable.GetRowCount ():
 			LastPortrait = 0
-		if GemRB.GetTableValue (PortraitsTable, LastPortrait, 0) == Gender:
+		if PortraitsTable.GetValue (LastPortrait, 0) == Gender:
 			SetPicture ()
 			return
 
@@ -73,13 +73,14 @@
 	while True:
 		LastPortrait = LastPortrait - 1
 		if LastPortrait < 0:
-			LastPortrait = GemRB.GetTableRowCount (PortraitsTable)-1
-		if GemRB.GetTableValue (PortraitsTable, LastPortrait, 0) == Gender:
+			LastPortrait = PortraitsTable.GetRowCount ()-1
+		if PortraitsTable.GetValue (LastPortrait, 0) == Gender:
 			SetPicture ()
 			return
 
 def BackPress():
-	GemRB.UnloadWindow (AppearanceWindow)
+	if AppearanceWindow:
+		AppearanceWindow.Unload ()
 	GemRB.SetNextScript ("GUICG1")
 	GemRB.SetVar ("Gender",0) #scrapping the gender value
 	return
@@ -87,63 +88,66 @@
 def CustomDone():
 	Window = CustomWindow
 
-	Portrait = GemRB.QueryText (Window, PortraitList1)
+	Portrait = PortraitList1.QueryText ()
 	GemRB.SetToken ("LargePortrait", Portrait)
-	Portrait = GemRB.QueryText (Window, PortraitList2)
+	Portrait = PortraitList2.QueryText ()
 	GemRB.SetToken ("SmallPortrait", Portrait)
-	GemRB.UnloadWindow (Window)
-	GemRB.UnloadWindow (AppearanceWindow)
+	if Window:
+		Window.Unload ()
+	if AppearanceWindow:
+		AppearanceWindow.Unload ()
 	GemRB.SetNextScript ("CharGen2")
 	return
 
 def CustomAbort():
-	GemRB.UnloadWindow (CustomWindow)
+	if CustomWindow:
+		CustomWindow.Unload ()
 	return
 
 def LargeCustomPortrait():
 	Window = CustomWindow
 
-	Portrait = GemRB.QueryText (Window, PortraitList1)
+	Portrait = PortraitList1.QueryText ()
 	#small hack
 	if GemRB.GetVar ("Row1") == RowCount1:
 		return
 
-	Label = GemRB.GetControl (Window, 0x10000007)
-	GemRB.SetText (Window, Label, Portrait)
+	Label = Window.GetControl (0x10000007)
+	Label.SetText (Portrait)
 
-	Button = GemRB.GetControl (Window, 6)
+	Button = Window.GetControl (6)
 	if Portrait=="":
 		Portrait = "NOPORTLG"
-		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
+		Button.SetState (IE_GUI_BUTTON_DISABLED)
 	else:
-		if GemRB.QueryText (Window, PortraitList2)!="":
-			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+		if PortraitList2.QueryText ()!="":
+			Button.SetState (IE_GUI_BUTTON_ENABLED)
 
-	Button = GemRB.GetControl (Window, 0)
-	GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTLG")
+	Button = Window.GetControl (0)
+	Button.SetPicture (Portrait, "NOPORTLG")
 	return
 
 def SmallCustomPortrait():
 	Window = CustomWindow
 
-	Portrait = GemRB.QueryText (Window, PortraitList2)
+	Portrait = PortraitList2.QueryText ()
 	#small hack
 	if GemRB.GetVar ("Row2") == RowCount2:
 		return
 
-	Label = GemRB.GetControl (Window, 0x10000008)
-	GemRB.SetText (Window, Label, Portrait)
+	Label = Window.GetControl (0x10000008)
+	Label.SetText (Portrait)
 
-	Button = GemRB.GetControl (Window, 6)
+	Button = Window.GetControl (6)
 	if Portrait=="":
 		Portrait = "NOPORTSM"
-		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
+		Button.SetState (IE_GUI_BUTTON_DISABLED)
 	else:
-		if GemRB.QueryText (Window, PortraitList1)!="":
-			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+		if PortraitList1.QueryText ()!="":
+			Button.SetState (IE_GUI_BUTTON_ENABLED)
 
-	Button = GemRB.GetControl (Window, 1)
-	GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTSM")
+	Button = Window.GetControl (1)
+	Button.SetPicture (Portrait, "NOPORTSM")
 	return
 
 def CustomPress():
@@ -151,47 +155,47 @@
 	global RowCount1, RowCount2
 	global CustomWindow
 
-	CustomWindow = Window = GemRB.LoadWindow (18)
-	PortraitList1 = GemRB.GetControl (Window, 2)
+	CustomWindow = Window = GemRB.LoadWindowObject (18)
+	PortraitList1 = Window.GetControl (2)
 	RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0)
-	GemRB.SetEvent (Window, PortraitList1, IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait")
+	PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait")
 	GemRB.SetVar ("Row1", RowCount1)
-	GemRB.SetVarAssoc (Window, PortraitList1, "Row1",RowCount1)
+	PortraitList1.SetVarAssoc ("Row1",RowCount1)
 
-	PortraitList2 = GemRB.GetControl (Window, 4)
+	PortraitList2 = Window.GetControl (4)
 	RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1)
-	GemRB.SetEvent (Window, PortraitList2, IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait")
+	PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait")
 	GemRB.SetVar ("Row2", RowCount2)
-	GemRB.SetVarAssoc (Window, PortraitList2, "Row2",RowCount2)
+	PortraitList2.SetVarAssoc ("Row2",RowCount2)
 
-	Button = GemRB.GetControl (Window, 6)
-	GemRB.SetText (Window, Button, 11973)
-	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomDone")
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
+	Button = Window.GetControl (6)
+	Button.SetText (11973)
+	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomDone")
+	Button.SetState (IE_GUI_BUTTON_DISABLED)
 
-	Button = GemRB.GetControl (Window, 7)
-	GemRB.SetText (Window, Button, 15416)
-	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomAbort")
+	Button = Window.GetControl (7)
+	Button.SetText (15416)
+	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomAbort")
 
-	Button = GemRB.GetControl (Window, 0)
-	PortraitName = GemRB.GetTableRowName (PortraitsTable, LastPortrait)+"L"
-	GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTLG")
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+	Button = Window.GetControl (0)
+	PortraitName = PortraitsTable.GetRowName (LastPortrait)+"L"
+	Button.SetPicture (PortraitName, "NOPORTLG")
+	Button.SetState (IE_GUI_BUTTON_LOCKED)
 
-	Button = GemRB.GetControl (Window, 1)
-	PortraitName = GemRB.GetTableRowName (PortraitsTable, LastPortrait)+"S"
-	GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTSM")
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+	Button = Window.GetControl (1)
+	PortraitName = PortraitsTable.GetRowName (LastPortrait)+"S"
+	Button.SetPicture (PortraitName, "NOPORTSM")
+	Button.SetState (IE_GUI_BUTTON_LOCKED)
 
-	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+	Window.ShowModal (MODAL_SHADOW_GRAY)
 	return
 
 def NextPress():
-	GemRB.UnloadWindow (AppearanceWindow)
-	PortraitTable = GemRB.LoadTable ("pictures")
-	PortraitName = GemRB.GetTableRowName (PortraitTable, LastPortrait )
+	if AppearanceWindow:
+		AppearanceWindow.Unload ()
+	PortraitTable = GemRB.LoadTableObject ("pictures")
+	PortraitName = PortraitTable.GetRowName (LastPortrait )
 	GemRB.SetToken ("SmallPortrait", PortraitName+"S")
 	GemRB.SetToken ("LargePortrait", PortraitName+"L")
-	GemRB.UnloadTable (PortraitTable)
 	GemRB.SetNextScript ("CharGen2") #Before race
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py	2009-02-01 22:02:14 UTC (rev 5612)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py	2009-02-01 22:05:31 UTC (rev 5613)
@@ -20,17 +20,16 @@
 IE_ANIM_ID = 206
 
 def RefreshPDoll():
-	PDollTable = GemRB.LoadTable("pdolls")
+	PDollTable = GemRB.LoadTableObject("pdolls")
 	AnimID = 0x6000
-	table = GemRB.LoadTable("avprefr")
-	AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Race"),0)
-	table = GemRB.LoadTable("avprefc")
-	AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Class"),0)
-	table = GemRB.LoadTable("avprefg")
-	AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0)
-	ResRef = GemRB.GetTableValue(PDollTable,hex(AnimID), "LEVEL1")
-	GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef,
-		0, MinorColor, MajorColor, SkinColor, 0, 0, HairColor, 0)
+	table = GemRB.LoadTableObject("avprefr")
+	AnimID = AnimID+table.GetValue(GemRB.GetVar("Race"),0)
+	table = GemRB.LoadTableObject("avprefc")
+	AnimID = AnimID+table.GetValue(GemRB.GetVar("Class"),0)
+	table = GemRB.LoadTableObject("avprefg")
+	AnimID = AnimID+table.GetValue(GemRB.GetVar("Gender"),0)
+	ResRef = PDollTable.GetValue(hex(AnimID), "LEVEL1")
+	PDollButton.SetPLT(ResRef, 0, MinorColor, MajorColor, SkinColor, 0, 0, HairColor, 0)
 
 	return
 
@@ -40,119 +39,120 @@
 	global HairColor, SkinColor, MinorColor, MajorColor
 	
 	GemRB.LoadWindowPack("GUICG")
-	ColorWindow=GemRB.LoadWindow(13)
+	ColorWindow=GemRB.LoadWindowObject(13)
 
-	ColorTable = GemRB.LoadTable("clowncol")
+	ColorTable = GemRB.LoadTableObject("clowncol")
 	#set these colors to some default
-	PortraitTable = GemRB.LoadTable("pictures")
+	PortraitTable = GemRB.LoadTableObject("pictures")
 	PortraitName = GemRB.GetToken("LargePortrait")
 	PortraitName = PortraitName[0:len(PortraitName)-1]
-	PortraitIndex = GemRB.GetTableRowIndex(PortraitTable, PortraitName)
+	PortraitIndex = PortraitTable.GetRowIndex(PortraitName)
 	if PortraitIndex<0:
-		HairColor=GemRB.GetTableValue(PortraitTable,0,1)
-		SkinColor=GemRB.GetTableValue(PortraitTable,0,2)
-		MinorColor=GemRB.GetTableValue(PortraitTable,0,3)
-		MajorColor=GemRB.GetTableValue(PortraitTable,0,4)
+		HairColor=PortraitTable.GetValue(0,1)
+		SkinColor=PortraitTable.GetValue(0,2)
+		MinorColor=PortraitTable.GetValue(0,3)
+		MajorColor=PortraitTable.GetValue(0,4)
 	else:
-		HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1)
-		SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2)
-		MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3)
-		MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4)
+		HairColor=PortraitTable.GetValue(PortraitIndex,1)
+		SkinColor=PortraitTable.GetValue(PortraitIndex,2)
+		MinorColor=PortraitTable.GetValue(PortraitIndex,3)
+		MajorColor=PortraitTable.GetValue(PortraitIndex,4)
 
-	PDollButton = GemRB.GetControl(ColorWindow, 1)
-	GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR)
+	PDollButton = ColorWindow.GetControl(1)
+	PDollButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR)
 
-	HairButton = GemRB.GetControl(ColorWindow, 2)
-	GemRB.SetButtonFlags(ColorWindow, HairButton, IE_GUI_BUTTON_PICTURE,OP_OR)
-	GemRB.SetEvent(ColorWindow, HairButton, IE_GUI_BUTTON_ON_PRESS,"HairPress")
-	GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 0, 0, HairColor)
+	HairButton = ColorWindow.GetControl(2)
+	HairButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR)
+	HairButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"HairPress")
+	HairButton.SetBAM("COLGRAD", 0, 0, HairColor)
 
-	SkinButton = GemRB.GetControl(ColorWindow, 3)
-	GemRB.SetButtonFlags(ColorWindow, SkinButton, IE_GUI_BUTTON_PICTURE,OP_OR)
-	GemRB.SetEvent(ColorWindow, SkinButton, IE_GUI_BUTTON_ON_PRESS,"SkinPress")
-	GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 0, 0, SkinColor)
+	SkinButton = ColorWindow.GetControl(3)
+	SkinButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR)
+	SkinButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"SkinPress")
+	SkinButton.SetBAM("COLGRAD", 0, 0, SkinColor)
 
-	MajorButton = GemRB.GetControl(ColorWindow, 5)
-	GemRB.SetButtonFlags(ColorWindow, MajorButton, IE_GUI_BUTTON_PICTURE,OP_OR)
-	GemRB.SetEvent(ColorWindow, MajorButton, IE_GUI_BUTTON_ON_PRESS,"MajorPress")
-	GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 0, 0, MinorColor)
+	MajorButton = ColorWindow.GetControl(5)
+	MajorButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR)
+	MajorButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"MajorPress")
+	MajorButton.SetBAM("COLGRAD", 0, 0, MinorColor)
 
-	MinorButton = GemRB.GetControl(ColorWindow, 4)
-	GemRB.SetButtonFlags(ColorWindow, MinorButton, IE_GUI_BUTTON_PICTURE,OP_OR)
-	GemRB.SetEvent(ColorWindow, MinorButton, IE_GUI_BUTTON_ON_PRESS,"MinorPress")
-	GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 0, 0, MajorColor)
+	MinorButton = ColorWindow.GetControl(4)
+	MinorButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR)
+	MinorButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"MinorPress")
+	MinorButton.SetBAM("COLGRAD", 0, 0, MajorColor)
 
-	BackButton = GemRB.GetControl(ColorWindow,13)
-	GemRB.SetText(ColorWindow,BackButton,15416)
-	DoneButton = GemRB.GetControl(ColorWindow,0)
-	GemRB.SetText(ColorWindow,DoneButton,11973)
-	GemRB.SetButtonFlags(ColorWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
+	BackButton = ColorWindow.GetControl(13)
+	BackButton.SetText(15416)
+	DoneButton = ColorWindow.GetControl(0)
+	DoneButton.SetText(11973)
+	DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
 
-	GemRB.SetEvent(ColorWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
-	GemRB.SetEvent(ColorWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
+	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	RefreshPDoll()
-	GemRB.SetVisible(ColorWindow,1)
+	ColorWindow.SetVisible(1)
 	return
 
 def DonePress():
 	global HairColor, SkinColor, MinorColor, MajorColor
 
-	GemRB.UnloadWindow(ColorPicker)
-	GemRB.SetVisible(ColorWindow,1)
-	PickedColor=GemRB.GetTableValue(ColorTable, ColorIndex, GemRB.GetVar("Selected"))
+	if ColorPicker:
+		ColorPicker.Unload()
+	ColorWindow.SetVisible(1)
+	PickedColor=ColorTable.GetValue(ColorIndex, GemRB.GetVar("Selected"))
 	if ColorIndex==0:
 		HairColor=PickedColor
-		GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 0, 0, HairColor)
+		HairButton.SetBAM("COLGRAD", 0, 0, HairColor)
 		RefreshPDoll()
 		return
 	if ColorIndex==1:
 		SkinColor=PickedColor
-		GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 0, 0, SkinColor)
+		SkinButton.SetBAM("COLGRAD", 0, 0, SkinColor)
 		RefreshPDoll()
 		return
 	if ColorIndex==2:
 		MinorColor=PickedColor
-		GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 0, 0, MinorColor)
+		MajorButton.SetBAM("COLGRAD", 0, 0, MinorColor)
 		RefreshPDoll()
 		return
 
 	MajorColor=PickedColor
-	GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 0, 0, MajorColor)
+	MinorButton.SetBAM("COLGRAD", 0, 0, MajorColor)
 	RefreshPDoll()
 	return
 
 def GetColor():
 	global ColorPicker
 
-	ColorPicker=GemRB.LoadWindow(14)
+	ColorPicker=GemRB.LoadWindowObject(14)
 	GemRB.SetVar("Selected",-1)
 	for i in range(34):
-		Button = GemRB.GetControl(ColorPicker, i)
-		GemRB.SetButtonState(ColorPicker, Button, IE_GUI_BUTTON_LOCKED)
-		GemRB.SetButtonFlags(ColorPicker, Button, IE_GUI_BUTTON_PICTURE,OP_OR)
-		#GemRB.SetButtonFlags(ColorPicker, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_RADIOBUTTON,OP_OR)

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[5753] gemrb/trunk/gemrb/GUIScripts/bg1

From: <avenger_teambg@us...> - 2009-02-28 21:12

Revision: 5753
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5753&view=rev
Author:   avenger_teambg
Date:     2009-02-28 21:12:06 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
more default enter/cancel buttons

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py
    gemrb/trunk/gemrb/GUIScripts/bg1/Start.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py	2009-02-27 21:30:03 UTC (rev 5752)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py	2009-02-28 21:12:06 UTC (rev 5753)
@@ -13,6 +13,8 @@
 	ExitButton = PartyFormationWindow.GetControl(30)
 	ExitButton.SetText(13906)
 	ExitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitPress")
+	ExitButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR)
+
 	ModifyCharactersButton = PartyFormationWindow.GetControl(43)
 	ModifyCharactersButton.SetText(18816)
 	ModifyCharactersButton.SetState(IE_GUI_BUTTON_DISABLED)
@@ -67,10 +69,12 @@
 	CancelButton = ExitWindow.GetControl(2)
 	CancelButton.SetText(13727)
 	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress")
+	CancelButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR)
 	
 	DoneButton = ExitWindow.GetControl(1)
 	DoneButton.SetText(11973)
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitDonePress")
+	DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR)
 	
 	ExitWindow.SetVisible(1)
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/Start.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/Start.py	2009-02-27 21:30:03 UTC (rev 5752)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/Start.py	2009-02-28 21:12:06 UTC (rev 5753)
@@ -57,6 +57,7 @@
 	SinglePlayerButton.SetEvent(0, "NewSingle")
 	MoviesButton.SetEvent(0, "MissionPack")
 	ExitButton.SetEvent(0, "BackToMain")
+	ExitButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR)
 	if GemRB.GetString(24110) == "": # TODO: better way to detect lack of mission pack?
 		MoviesButton.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR)
 	return
@@ -70,9 +71,10 @@
 	SinglePlayerButton.SetEvent(0, "PregenPress")
 	MultiPlayerButton.SetEvent(0, "ConnectPress")
 	MoviesButton.SetEvent(0, "BackToMain")
+	MoviesButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR)
 	ExitButton.SetEvent(0, "")
 	ExitButton.SetStatus(IE_GUI_BUTTON_DISABLED)
-	ExitButton.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR)
+	ExitButton.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_SET)
 	return
 
 def ConnectPress():


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[5820] gemrb/trunk/gemrb/GUIScripts/bg1

From: <zefklop@us...> - 2009-03-22 18:09

Revision: 5820
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5820&view=rev
Author:   zefklop
Date:     2009-03-22 18:09:07 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
Yet another fix for reforming party...

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2009-03-22 16:11:46 UTC (rev 5819)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py	2009-03-22 18:09:07 UTC (rev 5820)
@@ -57,6 +57,7 @@
 		GemRB.UnhideGUI ()
 		OptionsWindow = OldOptionsWindow
 		OldOptionsWindow = None
+		SetSelectionChangeHandler(None)
 		return
 
 	GemRB.HideGUI ()
@@ -88,7 +89,7 @@
 	# reform party
 	Button = Window.GetControl (51)
 	Button.SetText (16559)
-	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenReformPartyWindow")
+	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenRecReformPartyWindow")
 
 	# customize
 	Button = Window.GetControl (50)
@@ -113,6 +114,12 @@
 	GUICommonWindows.PortraitWindow.SetVisible (1)
 	return
 
+#original returns to game before continuing...
+def OpenRecReformPartyWindow ():
+        OpenRecordsWindow()
+      	GemRB.SetTimedEvent ("OpenReformPartyWindow", 1)
+        return
+
 def GetNextLevelExp (Level, Class):
 	NextLevelTable = GemRB.LoadTableObject ("XPLEVEL")
 	Row = NextLevelTable.GetRowIndex (Class)

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2009-03-22 16:11:46 UTC (rev 5819)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py	2009-03-22 18:09:07 UTC (rev 5820)
@@ -409,7 +409,7 @@
 	hideflag = GemRB.HideGUI ()
 
 	if ReformPartyWindow:
-		ReformPartyWindow.Unload ()
+                ReformPartyWindow.Unload ()
 		GemRB.SetVar ("ActionsWindow", OldActionsWindow.ID)
 		GemRB.SetVar ("MessageWindow", OldMessageWindow.ID)
 		GemRB.SetVar ("OtherWindow", -1)
@@ -418,11 +418,12 @@
 		OldMessageWindow = None
 		ReformPartyWindow = None
 
-		#GemRB.LoadWindowPack ("GUIREC")
+		#GemRB.LoadWindowPack (GetWindowPack())
 		if hideflag:
 			GemRB.UnhideGUI ()
 		#re-enabling party size control
 		GemRB.GameSetPartySize (PARTY_SIZE)
+		UpdatePortraitWindow()
 		return
 
 	GemRB.LoadWindowPack (GetWindowPack())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemrb-commits] SF.net SVN: gemrb:[6585] gemrb/trunk/gemrb/GUIScripts/bg1

From: <fuzzie@us...> - 2009-06-22 20:01

Revision: 6585
          http://gemrb.svn.sourceforge.net/gemrb/?rev=6585&view=rev
Author:   fuzzie
Date:     2009-06-22 20:01:07 +0000 (Mon, 22 Jun 2009)

Log Message:
-----------
apply patch from danamin (#2802437) which rewrites bg1 chargen

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py
    gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py

Added Paths:
-----------
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGenCommon.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGenGui.py

Removed Paths:
-------------
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py
    gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,102 +20,48 @@
 #character generation (GUICG 0)
 import GemRB
 
-CharGenWindow = 0
-TextAreaControl = 0
-ImportButton = 0
-CancelButton = 0
+import CharGenCommon
+from CharGenGui import * 
 
-def OnLoad():
-	global CharGenWindow, TextAreaControl, ImportButton, CancelButton
-
-	GemRB.SetVar("Gender",0) #gender
-	GemRB.SetVar("Race",0) #race
-	GemRB.SetVar("Class",0) #class
-	GemRB.SetVar("Alignment",0) #alignment
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-
-	InfoAreaControl = CharGenWindow.GetControl(9)
-	InfoAreaControl.SetText(16575)
+def init():
+	print("init")
+		#(name,control,text)
+		#(name,script | setFn,commentFn,unsetFn,gaurd)
+	stages = [
+	("gender"	 , 0		, 11956		),
+	("Show name, ceate player" , None    ,getName, unsetPlayer,  setPlayer ),
+	("setGender"	, "GUICG1"	, getGender	,unsetGender		, None		), #BG2: same
+	("setPortrait"	, "GUICG12"	, None		,unsetPortrait		, None		), #BG2: different setPicture, PortaitName and extra unused control (TextAreaControl)
+	("race"		, 1		,11957		),
+	("setRace"	, "GUICG8"	, getRace	,unsetRace 		, None		), #BG2: different resources
+	("class"	, 2		,11959		),
+	("setClass"	, "GUICG2"	, getClass 	,unsetClass		, None 		), #BG2: different resources,other setLogic, has levels/XP
+	("setMultiClass", "GUICG10"	, None		,unsetClass	, guardMultiClass), #BG2: not same?
+	("setSpecialist", "GUICG22"	, None		,unsetClass	, guardSpecialist), #BG2: not same
+	("alignment"	, 3		,11958		),
+	("setAlignment"	, "GUICG3"	, getAlignment	,unsetAlignment		, None		), #bg2: BG1 doesn't take kits into account
+	("abilities"	, 4		,11960		),
+	("setAbilities"	, "GUICG4"	, getAbilities	,unsetAbilities		, None		), #bg2: BG2 has extra strength, overpress (functionality + resources), kits
+	("skill"	, 5		,17372		),
+	("divine spells" , None , getDivineSpells,unsetDivineSpells,setDivineSpells ),
+	("hate race"	, "GUICG15"	, getHatedRace	,unsetHateRace		, guardHateRace), #BG2: other listsize, button offset, BG2 has TopIndex
+	("mage spells"	, "GUICG7"	, getMageSpells,unsetMageSpells		, guardMageSpells),   #also sets priest in CharGen6, we do it at the end, other animations for buttons
+	("setSkill"	, "GUICG6"	, getSkills		,unsetSkill		, guardSkills	),
+	("proficiencies", "GUICG9"	, getProfi		,unsetProfi		, None		),
+	("appearance"	, 6		,11961		),
+	("colors"	, "GUICG13"	, None		,unsetColors	 	, None		), #bg2: other cycleids (SetBAM)
+	("sounds"	, "GUICG19"	, None		,unsetSounds		, None		), #BG2: other: first male sound, logic
+	("name"		, 7 		,11963		),
+	("setName"	 ,"GUICG5"	, None 		,unsetName		, None 		), #BG2: same	
+	("accept"	, 8		,11962		),
+	("finish"	, setAccept	, None 		, None			, None )]
 	
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_ENABLED)
-	GenderButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
+	CharGenCommon.CharGenMaster = CharGenCommon.CharGen(stages,16575,Imprt)
 
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	# this button does nothing when you click it at this stage:
-	# BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	GenderButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
 	return
-	
-def NextPress():
-	ImportButton.SetState(IE_GUI_BUTTON_DISABLED)
-	CancelButton.SetState(IE_GUI_BUTTON_DISABLED)
-	GemRB.DrawWindows()   #needed to redraw the windows NOW
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG1") #gender
-	return
 
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("Start")
+def OnLoad():
+	if(CharGenCommon.CharGenMaster == None):
+		init()
+	CharGenCommon.CharGenMaster.displayOverview()
 	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,125 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	GemRB.SetVar("Race",0) #race
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_ENABLED)
-	RaceButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	#BackButton.SetText(15416)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	RaceButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG8") #race
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen") #appearance
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen2")
-	GemRB.SetNextScript("ImportFile") #import
-	return

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,131 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	GemRB.SetVar("Class",0) #class
-	#GemRB.SetVar("Class Kit",0) #class kit
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_ENABLED)
-	ClassButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	#BackButton.SetText(15416)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	ClassButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG2") #class
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen2") #appearance
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen3")
-	GemRB.SetNextScript("ImportFile") #import
-	return

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,143 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	GemRB.SetVar("Alignment",-1) #alignment
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-	ClassTable = GemRB.LoadTableObject("classes")
-	KitTable = GemRB.LoadTableObject("kitlist")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_ENABLED)
-	AlignmentButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	#BackButton.SetText(15416)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	#BiographyButton = CharGenWindow.GetControl(16)
-	#BiographyButton.SetText(18003)
-	#BiographyButton.SetState(IE_GUI_BUTTON_DISABLED)
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-	TextAreaControl.Append(12136, -1)
-	TextAreaControl.Append(": ")
-	KitIndex = GemRB.GetVar("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
-	else:
-		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	AlignmentButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG3") #alignment
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen3") #appearance
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen4")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,148 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	for i in range(-1,6):
-		GemRB.SetVar("Ability "+str(i),0) #abilities
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-	ClassTable = GemRB.LoadTableObject("classes")
-	KitTable = GemRB.LoadTableObject("kitlist")
-	AlignmentTable = GemRB.LoadTableObject("aligns")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_ENABLED)
-	AbilitiesButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	#BackButton.SetText(15416)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	#BiographyButton = CharGenWindow.GetControl(16)
-	#BiographyButton.SetText(18003)
-	#BiographyButton.SetState(IE_GUI_BUTTON_DISABLED)
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-	TextAreaControl.Append(12136, -1)
-	TextAreaControl.Append(": ")
-	KitIndex = GemRB.GetVar("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
-	else:
-		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
-	TextAreaControl.Append(1049, -1)
-	TextAreaControl.Append(": ")
-	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
-	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	AbilitiesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG4") #abilities
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen4") #alignment
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen5")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,152 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	for i in range(6):
-		GemRB.SetVar("Skill "+str(i),0) #thieving skills
-	for i in range(32):
-		GemRB.SetVar("Prof "+str(i),0)  #proficiencies
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-	ClassTable = GemRB.LoadTableObject("classes")
-	KitTable = GemRB.LoadTableObject("kitlist")
-	AlignmentTable = GemRB.LoadTableObject("aligns")
-	AbilityTable = GemRB.LoadTableObject("ability")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_ENABLED)
-	SkillButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) 
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-	TextAreaControl.Append(12136, -1)
-	TextAreaControl.Append(": ")
-	KitIndex = GemRB.GetVar("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
-	else:
-		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
-	TextAreaControl.Append(1049, -1)
-	TextAreaControl.Append(": ")
-	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
-	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
-	for i in range(6):
-		v = AbilityTable.GetValue(i,2)
-		TextAreaControl.Append(v, -1)
-		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	SkillButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG15") #skills (haterace)
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen5") #abilities
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen6")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,147 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-	ClassTable = GemRB.LoadTableObject("classes")
-	KitTable = GemRB.LoadTableObject("kitlist")
-	AlignmentTable = GemRB.LoadTableObject("aligns")
-	AbilityTable = GemRB.LoadTableObject("ability")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_ENABLED)
-	AppearanceButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl(11)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-	TextAreaControl.Append(12136, -1)
-	TextAreaControl.Append(": ")
-	KitIndex = GemRB.GetVar("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
-	else:
-		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
-	TextAreaControl.Append(1049, -1)
-	TextAreaControl.Append(": ")
-	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
-	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
-	for i in range(6):
-		v = AbilityTable.GetValue(i,2)
-		TextAreaControl.Append(v, -1)
-		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	AppearanceButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG13") #colors
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen6") #skills
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen7")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,147 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-
-CharGenWindow = 0
-TextAreaControl = 0
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl
-
-	GemRB.LoadWindowPack("GUICG")
-	CharGenWindow = GemRB.LoadWindowObject(0)
-	PortraitButton = CharGenWindow.GetControl(12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject("races")
-	ClassTable = GemRB.LoadTableObject("classes")
-	KitTable = GemRB.LoadTableObject("kitlist")
-	AlignmentTable = GemRB.LoadTableObject("aligns")
-	AbilityTable = GemRB.LoadTableObject("ability")
-
-	GenderButton = CharGenWindow.GetControl(0)
-	GenderButton.SetText(11956)
-	GenderButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl(1)
-	RaceButton.SetText(11957)
-	RaceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl(2)
-	ClassButton.SetText(11959)
-	ClassButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl(3)
-	AlignmentButton.SetText(11958)
-	AlignmentButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl(4)
-	AbilitiesButton.SetText(11960)
-	AbilitiesButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl(5)
-	SkillButton.SetText(17372)
-	SkillButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl(6)
-	AppearanceButton.SetText(11961)
-	AppearanceButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl(7)
-	NameButton.SetText(11963)
-	NameButton.SetState(IE_GUI_BUTTON_ENABLED)
-	NameButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	BackButton = CharGenWindow.GetControl(11)
-	BackButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl(8)
-	AcceptButton.SetText(11962)
-	AcceptButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	ImportButton = CharGenWindow.GetControl(13)
-	ImportButton.SetText(13955)
-	ImportButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl(15)
-	CancelButton.SetText(13727)
-	CancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl(9)
-	TextAreaControl.SetText(12135)
-	TextAreaControl.Append(": ")
-	if GemRB.GetVar("Gender") == 1:
-		TextAreaControl.Append(1050)
-	else:
-		TextAreaControl.Append(1051)
-	TextAreaControl.Append(1048,-1) # new line
-	TextAreaControl.Append(": ")
-	TextAreaControl.Append(RaceTable.GetValue(GemRB.GetVar("Race")-1,2))
-	TextAreaControl.Append(12136, -1)
-	TextAreaControl.Append(": ")
-	KitIndex = GemRB.GetVar("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append(ClassTable.GetValue(GemRB.GetVar("Class")-1,2))
-	else:
-		TextAreaControl.Append(KitTable.GetValue(KitIndex,2) )
-	TextAreaControl.Append(1049, -1)
-	TextAreaControl.Append(": ")
-	v = AlignmentTable.FindValue(3,GemRB.GetVar("Alignment"))
-	TextAreaControl.Append(AlignmentTable.GetValue(v,2))
-	for i in range(6):
-		v = AbilityTable.GetValue(i,2)
-		TextAreaControl.Append(v, -1)
-		TextAreaControl.Append(": "+str(GemRB.GetVar("Ability "+str(i))))
-
-	CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	NameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible(1)
-	return
-	
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("GUICG5") #name
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetNextScript("CharGen7") #appearance
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload()
-	GemRB.SetToken("NextScript","CharGen8")
-	GemRB.SetNextScript("ImportFile") #import
-	return
-

Deleted: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -1,266 +0,0 @@
-# GemRB - Infinity Engine Emulator
-# Copyright (C) 2003 The GemRB Project
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# $Id$
-#
-#character generation (GUICG 0)
-import GemRB
-from ie_stats import *
-from GUICommon import *
-
-CharGenWindow = 0
-TextAreaControl = 0
-PortraitName = ""
-
-def OnLoad():
-	global CharGenWindow, TextAreaControl, PortraitName
-
-	GemRB.LoadWindowPack ("GUICG", 640, 480)
-	CharGenWindow = GemRB.LoadWindowObject (0)
-	PortraitButton = CharGenWindow.GetControl (12)
-	PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	PortraitName = GemRB.GetToken ("LargePortrait")
-	PortraitButton.SetPicture (PortraitName,"NOPORTLG")
-
-	RaceTable = GemRB.LoadTableObject ("races")
-	ClassTable = GemRB.LoadTableObject ("classes")
-	KitTable = GemRB.LoadTableObject ("kitlist")
-	AlignmentTable = GemRB.LoadTableObject ("aligns")
-	AbilityTable = GemRB.LoadTableObject ("ability")
-
-	GenderButton = CharGenWindow.GetControl (0)
-	GenderButton.SetText (11956)
-	GenderButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	RaceButton = CharGenWindow.GetControl (1)
-	RaceButton.SetText (11957)
-	RaceButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	ClassButton = CharGenWindow.GetControl (2)
-	ClassButton.SetText (11959)
-	ClassButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	AlignmentButton = CharGenWindow.GetControl (3)
-	AlignmentButton.SetText (11958)
-	AlignmentButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	AbilitiesButton = CharGenWindow.GetControl (4)
-	AbilitiesButton.SetText (11960)
-	AbilitiesButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	SkillButton = CharGenWindow.GetControl (5)
-	SkillButton.SetText (17372)
-	SkillButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	AppearanceButton = CharGenWindow.GetControl (6)
-	AppearanceButton.SetText (11961)
-	AppearanceButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	NameButton = CharGenWindow.GetControl (7)
-	NameButton.SetText (11963)
-	NameButton.SetState (IE_GUI_BUTTON_DISABLED)
-
-	BackButton = CharGenWindow.GetControl (11)
-	BackButton.SetState (IE_GUI_BUTTON_ENABLED)
-
-	AcceptButton = CharGenWindow.GetControl (8)
-	AcceptButton.SetText (11962)
-	AcceptButton.SetState (IE_GUI_BUTTON_ENABLED)
-	AcceptButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	ImportButton = CharGenWindow.GetControl (13)
-	ImportButton.SetText (13955)
-	ImportButton.SetState (IE_GUI_BUTTON_ENABLED)
-
-	CancelButton = CharGenWindow.GetControl (15)
-	CancelButton.SetText (13727)
-	CancelButton.SetState (IE_GUI_BUTTON_ENABLED)
-
-	TextAreaControl= CharGenWindow.GetControl (9)
-
-	TextAreaControl.SetText (1047)
-	TextAreaControl.Append (": ")
-	TextAreaControl.Append (GemRB.GetToken ("CHARNAME") )
-
-	TextAreaControl.Append (12135, -1)
-	TextAreaControl.Append (": ")
-	if GemRB.GetVar ("Gender") == 1:
-		TextAreaControl.Append (1050)
-	else:
-		TextAreaControl.Append (1051)
-	TextAreaControl.Append (1048,-1) # new line
-	TextAreaControl.Append (": ")
-	TextAreaControl.Append (RaceTable.GetValue (GemRB.GetVar ("Race")-1,2))
-	TextAreaControl.Append (12136, -1)
-	TextAreaControl.Append (": ")
-	KitIndex = GemRB.GetVar ("Class Kit")
-	if KitIndex == 0:
-		TextAreaControl.Append (ClassTable.GetValue (GemRB.GetVar ("Class")-1,2))
-	else:
-		TextAreaControl.Append (KitTable.GetValue (KitIndex,2) )
-	TextAreaControl.Append (1049, -1)
-	TextAreaControl.Append (": ")
-	v = AlignmentTable.FindValue (3,GemRB.GetVar ("Alignment"))
-	TextAreaControl.Append (AlignmentTable.GetValue (v,2))
-	for i in range(6):
-		v = AbilityTable.GetValue (i,2)
-		TextAreaControl.Append (v, -1)
-		TextAreaControl.Append (": "+str(GemRB.GetVar ("Ability "+str(i))))
-
-	CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress")
-	BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress")
-	AcceptButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NextPress")
-	ImportButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportPress")
-	CharGenWindow.SetVisible (1)
-	return
-
-def NextPress():
-	if CharGenWindow:
-		CharGenWindow.Unload ()
-	#set my character up
-	MyChar = GemRB.GetVar ("Slot")
-	GemRB.CreatePlayer ("charbase", MyChar | 0x8000 )
-	GemRB.SetPlayerStat (MyChar, IE_SEX, GemRB.GetVar ("Gender") )
-	GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("Race") )
-	ClassTable = GemRB.LoadTableObject ("classes")
-	ClassIndex = GemRB.GetVar ("Class")-1
-	Class = ClassTable.GetValue (ClassIndex, 5)
-	GemRB.SetPlayerStat (MyChar, IE_CLASS, Class)
-	KitIndex = GemRB.GetVar ("Class Kit")
-	GemRB.SetPlayerStat (MyChar, IE_KIT, KitIndex)
-	t = GemRB.GetVar ("Alignment")
-	GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, t)
-
-	TmpTable = GemRB.LoadTableObject ("clskills")
-	#mage spells
-	TableName = TmpTable.GetValue (Class, 1, 0)
-	if TableName != "*":
-		SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_WIZARD, 1)
-		Learnable = GetLearnableMageSpells( KitIndex, t, 1)
-		SpellBook = GemRB.GetVar ("MageSpellBook")
-		j=1
-		for i in range(len(Learnable) ):
-			if SpellBook & j:
-				GemRB.LearnSpell (MyChar, Learnable[i], 0)
-			j=j<<1
-
-	#priest spells
-	TableName = TmpTable.GetValue (Class, 1, 0)
-	if TableName != "*":
-		SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_PRIEST, 1)
-		ClassFlag = 0 #set this according to class
-		Learnable = GetLearnablePriestSpells( ClassFlag, t, 1)
-		for i in range(len(Learnable) ):
-			GemRB.LearnSpell (MyChar, Learnable[i], 0)
-
-	TmpTable=GemRB.LoadTableObject ("repstart")
-	AlignmentTable = GemRB.LoadTableObject ("aligns")
-	t = AlignmentTable.FindValue (3, t)
-	t = TmpTable.GetValue (t,0) * 10
-	GemRB.SetPlayerStat (MyChar, IE_REPUTATION, t)
-
-	#slot 1 is the protagonist
-	if MyChar == 1:
-		GemRB.GameSetReputation( t )
-
-	TmpTable=GemRB.LoadTableObject ("strtgold")
-	t = GemRB.Roll (TmpTable.GetValue (Class,1),TmpTable.GetValue (Class,0), TmpTable.GetValue (Class,2) )
-	GemRB.SetPlayerStat (MyChar, IE_GOLD, t*TmpTable.GetValue (Class,3) )
-
-	GemRB.SetPlayerStat (MyChar, IE_HATEDRACE, GemRB.GetVar ("HatedRace") )
-	TmpTable=GemRB.LoadTableObject ("ability")
-	AbilityCount = TmpTable.GetRowCount ()
-	for i in range(AbilityCount):
-		StatID=TmpTable.GetValue (i,4)
-		GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Ability "+str(i) ) )
-
-	# set the base number of attacks; effects will add the proficiency bonus
-	GemRB.SetPlayerStat (MyChar, IE_NUMBEROFATTACKS, 2)
-	TmpTable=GemRB.LoadTableObject ("weapprof")
-	ProfCount = TmpTable.GetRowCount ()
-	for i in range(7,ProfCount):
-		StatID=TmpTable.GetValue (i, 0)
-		GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Prof "+str(i) ) )
-
-	SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("HairColor") )
-	SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("SkinColor") )
-	SetColorStat (MyChar, IE_MAJOR_COLOR, GemRB.GetVar ("MajorColor") )
-	SetColorStat (MyChar, IE_MINOR_COLOR, GemRB.GetVar ("MinorColor") )
-	SetColorStat (MyChar, IE_METAL_COLOR, 0x1B )
-	SetColorStat (MyChar, IE_LEATHER_COLOR, 0x16 )
-	SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 )
-	GemRB.SetPlayerStat (MyChar, IE_EA, 2 )
-	Str=GemRB.GetVar ("Ability 0")
-	GemRB.SetPlayerStat (MyChar, IE_STR, Str)
-	if Str==18:
-		GemRB.SetPlayerStat (MyChar,IE_STREXTRA,GemRB.GetVar ("StrExtra"))
-	else:
-		GemRB.SetPlayerStat (MyChar, IE_STREXTRA,0)
-
-	GemRB.SetPlayerStat (MyChar, IE_DEX, GemRB.GetVar ("Ability 1"))
-	GemRB.SetPlayerStat (MyChar, IE_CON, GemRB.GetVar ("Ability 2"))
-	GemRB.SetPlayerStat (MyChar, IE_INT, GemRB.GetVar ("Ability 3"))
-	GemRB.SetPlayerStat (MyChar, IE_WIS, GemRB.GetVar ("Ability 4"))
-	GemRB.SetPlayerStat (MyChar, IE_CHR, GemRB.GetVar ("Ability 5"))
-
-	#setting skills (thieving/ranger)
-	TmpTable = GemRB.LoadTableObject ("skills")
-	RowCount = TmpTable.GetRowCount ()-2
-
-	for i in range(RowCount):
-		stat = TmpTable.GetValue (i+2, 2)
-		value = GemRB.GetVar ("Skill "+str(i) )
-		GemRB.SetPlayerStat (MyChar, stat, value )
-
-	GemRB.SetPlayerName (MyChar, GemRB.GetToken ("CHARNAME"), 0)
-	#does all the rest
-	LargePortrait = GemRB.GetToken ("LargePortrait")
-	SmallPortrait = GemRB.GetToken ("SmallPortrait")
-	GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait)
-	#10 is a weapon slot (see slottype.2da row 10)
-	GemRB.CreateItem (MyChar, "staf01", 10, 1, 0, 0)
-	GemRB.SetEquippedQuickSlot (MyChar, 0)
-	#LETS PLAY!!
-	playmode = GemRB.GetVar ("PlayMode")
-	if playmode >=0:
-		GemRB.EnterGame()
-	else:
-		#leaving multi player pregen
-		if CharGenWindow:
-			CharGenWindow.Unload ()
-		GemRB.SetNextScript ("GUIMP")
-	return
-
-def CancelPress():
-	if CharGenWindow:
-		CharGenWindow.Unload ()
-	GemRB.SetNextScript ("CharGen")
-	return
-
-def BackPress():
-	if CharGenWindow:
-		CharGenWindow.Unload ()
-	GemRB.SetNextScript ("CharGen8") #name
-	return
-
-def ImportPress():
-	if CharGenWindow:
-		CharGenWindow.Unload ()
-	GemRB.SetToken ("NextScript","CharGen9")
-	GemRB.SetNextScript ("ImportFile") #import
-	return
-

Added: gemrb/trunk/gemrb/GUIScripts/bg1/CharGenCommon.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGenCommon.py	                        (rev 0)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGenCommon.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -0,0 +1,280 @@
+# GemRB - Infinity Engine Emulator
+# Copyright (C) 2003 The GemRB Project
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# $Id$
+#
+# common character generation display code
+import GemRB
+from ie_stats import *
+from GUIDefines import *
+from GUICommon import *
+from GUIClasses import *
+
+from GUICommon import CloseOtherWindow
+
+
+class CharGen:
+	def __init__(self,stages,startText,importFn,resetButton=False):
+		"""Sets up a character generation system.
+		slot: 	index of slot for which to generate 
+		stages: 	List stages
+		startText:		text to set info field in stage 0
+		importFn: 	function ran when import is pressed
+		resetButton:	whether or not to show a reset button
+		
+		where each stage is defined by either an intermediate screen: 
+			name: 		name
+			control: 		id of the controle
+			text: 		id of button text or string to use
+		or a request stage
+			name:			name
+			script | setFn:		script name to proceed or function to request and set data for this stage
+			commentFn(area):	function to append information to the text area
+			unsetFn:			function to remove data for this stage
+			gaurd			return wether or not to activate this stage 
+		"""
+		self.stages = stages
+		self.imp = importFn
+		self.showReset = resetButton
+		self.step = 0
+		self.window = None
+		self.startText=startText
+	
+	def displayOverview(self):
+		"""
+		Sets up the primary character generation window.
+		show all comments of previous stages		
+		"""
+		if(self.window): 
+			CharGenWindow = self.window
+		else:
+			GemRB.LoadWindowPack ("GUICG", 640, 480)
+			CharGenWindow = GemRB.LoadWindowObject (0)
+			CharGenWindow.SetFrame ()
+	
+		step = self.step
+		
+		#set portrait	
+		PortraitButton = CharGenWindow.GetControl (12)
+		PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
+		PortraitName = GemRB.GetToken ("LargePortrait")
+		PortraitButton.SetPicture (PortraitName, "NOPORTMD")
+		PortraitButton.SetState(IE_GUI_BUTTON_LOCKED)
+		
+		#set stage buttons
+		i = 0
+		for stage in self.stages:
+			if(len(stage) == 3): #short stage
+				(name,control,text) = stage
+				button = CharGenWindow.GetControl(control)
+				button.SetText(text);
+				if i == step:
+					button.SetState(IE_GUI_BUTTON_ENABLED)
+					button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
+					button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NextPress")
+				else:
+					button.SetState(IE_GUI_BUTTON_DISABLED)
+			i = i + 1
+		
+		#set back button	
+		BackButton = CharGenWindow.GetControl (11)
+		#BackButton.SetText (15416)
+		if(self.step != 0):
+			BackButton.SetState (IE_GUI_BUTTON_ENABLED)
+		else:
+			BackButton.SetState(IE_GUI_BUTTON_DISABLED)
+		BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress")
+		BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
+
+		#set scrollbar
+		ScrollBar = CharGenWindow.GetControl (10)
+		ScrollBar.SetDefaultScrollBar()	
+		
+		#set import
+		ImportButton = CharGenWindow.GetControl (13)
+		ImportButton.SetText (13955)
+		ImportButton.SetState (IE_GUI_BUTTON_ENABLED)
+		ImportButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportPress")
+
+		#set cancel and start over
+		CancelButton = CharGenWindow.GetControl (15)
+		if step == 0 or not self.showReset:
+			CancelButton.SetText (13727) # Cancel
+		else:
+			CancelButton.SetText (8159) # Start over
+		CancelButton.SetState (IE_GUI_BUTTON_ENABLED)
+		CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+
+		#set and fill overview
+		TextAreaControl = CharGenWindow.GetControl (9)
+		if(self.step == 0):
+			TextAreaControl.SetText(self.startText)
+		else:
+			TextAreaControl.SetText("")
+		for part in range(step):
+			if(len(self.stages[part]) == 5):
+				(name,setFn,commentFn,unsetFn,guard) = self.stages[part]
+				if(commentFn != None):
+					commentFn(TextAreaControl)
+		
+		#show
+		CharGenWindow.SetVisible(1)
+		CharGenWindow.Invalidate()
+		self.window = CharGenWindow
+	
+	def unset(self,stage):
+		#print "unset" , stage
+		if(len(self.stages[stage]) == 5):
+			(name,setFn,commentFn,unsetFn,guard) = self.stages[stage]
+			if(unsetFn != None):
+				unsetFn()
+	#set next script to for step, return false if the current step should be skipped
+	def setScript(self):
+		#print 'set',self.step
+		if(len(self.stages[self.step]) == 5): #long record: script of function
+			(name,setFn,commentFn,unsetFn,guardFn) = self.stages[self.step]
+			if(guardFn and not guardFn()):
+				return False
+			if(callable(setFn)):
+				setFn()
+			else:
+				GemRB.SetNextScript(setFn)
+		else: #short record: overview
+			GemRB.SetNextScript ("CharGen")
+		return True
+		
+	def cancel(self):
+		"""Revert back to the first step; unset all actions."""
+		#if self.window:
+		#	self.window.Unload()
+		#reset
+		for i in range(self.step,-1,-1):
+			self.unset(i)
+
+		# if required back to main screen, otherwise reloop
+		if self.step == 0 or not self.showReset:	
+			self.window.Unload()
+			self.window = None
+			GemRB.SetNextScript ("Start")
+		else:
+			GemRB.SetNextScript ("CharGen")
+
+		self.step = 0
+
+
+	def imprt(self):
+		"""Opens the character import window."""
+		self.imp()
+
+	def back(self):
+		"""Moves to the previous step. Unsets last"""
+		CloseOtherWindow(None)
+		self.unset(self.step)
+		if len(self.stages[self.step]) == 3:
+			#short, return to other short
+			self.step = self.step - 1
+			self.unset(self.step)
+			while len(self.stages[self.step]) != 3:
+				self.step = self.step - 1
+				self.unset(self.step)
+		else:
+			self.step = self.step - 1
+			self.unset(self.step)
+
+		while(not self.setScript()):
+			self.step = self.step - 1
+			self.unset(self.step)
+
+	
+	def next(self):
+		"""Calls the next setter."""
+		CloseOtherWindow(None)
+		self.step = self.step + 1
+		while(not self.setScript()):
+			self.step = self.step + 1
+
+	def close(self):
+		if(self.window):
+			self.window.Unload()
+	
+	def jumpTo(self,to):
+		if type(to) == str:
+			done = False
+			for i in range(len(self.stages)):
+				if(to == self.stages[i][0]):
+					self.step = i
+					done = True
+			if(not done):
+				raise ValueError("stage name not found: "+str(to))
+		elif type(to) == int:
+			if(to<0):
+				to = len(self.stages)+to
+			if(to<0 or to>=len(self.stages)):
+				raise ValueError("stage index not found: "+str(to))
+			self.step = to
+			
+			return
+		else:
+			raise ValueError("bad arg type: "+str(type(to)) + " " + str(to))
+		CloseOtherWindow(None)
+		while(not self.setScript()):
+			self.step = self.step + 1
+					 	
+CharGenMaster = None
+
+def CancelPress():
+	"""Revert back to the first step; if there, free the actor."""
+	global CharGenMaster
+	CharGenMaster.cancel()
+
+def ImportPress():
+	"""Opens the character import window."""
+	global CharGenMaster
+	CharGenMaster.imprt()
+
+
+def BackPress():
+	"""Moves to the previous step."""
+	global CharGenMaster
+	print "back"
+	CharGenMaster.back()
+	
+def NextPress():
+	"""Moves to the next step."""
+	global CharGenMaster
+	CharGenMaster.next()
+
+def back():
+	"""Moves to the previous step."""
+	global CharGenMaster
+	CharGenMaster.back()
+
+def next():
+	"""Moves to the next step."""
+	global CharGenMaster
+	CharGenMaster.next()
+
+def close():
+	"""Terminates CharGen."""
+	global CharGenMaster
+	CharGenMaster.close()
+	CharGenMaster = None
+
+def jumpTo(stage):
+	global CharGenMaster
+	CharGenMaster.jumpTo(stage)
+

Added: gemrb/trunk/gemrb/GUIScripts/bg1/CharGenGui.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/CharGenGui.py	                        (rev 0)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGenGui.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -0,0 +1,390 @@
+import GemRB
+from CharGenCommon import * 
+from GUICommonWindows import *;
+
+def Imprt():
+	GemRB.SetToken("NextScript","CharGen")
+	GemRB.SetNextScript("ImportFile") #import
+	return
+
+def setPlayer():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.CreatePlayer ("charbase", MyChar | 0x8000 )
+	return False
+
+def unsetPlayer():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.CreatePlayer ("", MyChar | 0x8000 )
+	return False
+
+def unsetGender():
+	#print "unset Gender"
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_SEX, 0)
+
+def unsetPortrait():
+	#print "unset Portrait"
+	GemRB.SetToken("SmallPortrait","")
+	GemRB.SetToken("LargePortrait","")
+
+def getGender(area):
+	MyChar = GemRB.GetVar ("Slot")
+	area.SetText(12135)
+	area.Append (": ")
+	if GemRB.GetPlayerStat(MyChar,IE_SEX) == 1:
+		return area.Append(1050)
+	else:
+		return area.Append(1051)
+
+#race
+def unsetRace():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_RACE, 0)
+
+def getRace(area):
+	MyChar = GemRB.GetVar ("Slot")
+	RaceID = GemRB.GetPlayerStat (MyChar, IE_RACE)
+	RaceIndex = RaceTable.FindValue(3,RaceID)
+	RaceCap = RaceTable.GetValue(RaceIndex,2)
+	area.Append(1048,-1) # new line
+	area.Append(": ")
+	area.Append(RaceCap)
+
+#class
+def unsetClass():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_CLASS, 0)
+	GemRB.SetPlayerStat (MyChar, IE_KIT, 0)
+	
+def getClass(area):
+	MyChar = GemRB.GetVar ("Slot")
+	ClassTitle = GetActorClassTitle(MyChar)
+
+	area.Append(12136, -1)
+	area.Append(": ")
+	area.Append(ClassTitle)
+	
+def guardSpecialist():
+	return GemRB.GetVar("Specialist") == 1
+
+def guardMultiClass():
+	return GemRB.GetVar("Multi Class") == 1
+
+
+#Alignment
+def unsetAlignment():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT,0)
+	
+def getAlignment(area):
+	AlignmentTable = GemRB.LoadTableObject("aligns")
+	
+	MyChar = GemRB.GetVar ("Slot")
+	AllignID = GemRB.GetPlayerStat (MyChar, IE_ALIGNMENT)
+	
+	area.Append(1049, -1)
+	area.Append(": ")
+	AllignIndex = AlignmentTable.FindValue(3,AllignID)
+	AllignCap = AlignmentTable.GetValue(AllignIndex,2)
+	area.Append(AllignCap)
+	area.Append("\n")
+
+#Abilties
+def unsetAbilities():
+	MyChar = GemRB.GetVar ("Slot")
+	AbilityTable = GemRB.LoadTableObject ("ability")
+	AbilityCount = AbilityTable.GetRowCount ()
+	
+	# set all our abilites to zero
+	GemRB.SetPlayerStat (MyChar, IE_STREXTRA, 0)
+	for i in range(AbilityCount):
+		StatID = AbilityTable.GetValue (i, 3)
+		GemRB.SetPlayerStat (MyChar, StatID, 0)
+
+def getAbilities(area):
+	MyChar = GemRB.GetVar ("Slot")
+	AbilityTable = GemRB.LoadTableObject ("ability")
+	AbilityCount = AbilityTable.GetRowCount ()
+	for i in range(AbilityCount):
+		v = AbilityTable.GetValue(i,2)
+		id = AbilityTable.GetValue(i,3)
+		area.Append(v, -1)
+		area.Append(": "+str(GemRB.GetPlayerStat(MyChar,id)))
+	area.Append("\n")
+	area.Append("\n")
+
+#Skill
+def unsetHateRace():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat(MyChar, IE_HATEDRACE, 0 )
+
+def guardHateRace():
+	MyChar = GemRB.GetVar ("Slot")
+	Class = GemRB.GetPlayerStat(MyChar,IE_CLASS)
+	TmpTable = GemRB.LoadTableObject("clskills")
+	ClassName = TmpTable.GetRowName(Class)
+	TableName = TmpTable.GetValue(ClassName, "HATERACE")
+	return TableName != "*"
+
+def getHatedRace(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	Race = GemRB.GetPlayerStat(MyChar, IE_HATEDRACE)
+	if Race:
+		HateRaceTable = GemRB.LoadTableObject ("HATERACE")
+		Row = HateRaceTable.FindValue (1, Race)
+		info = GemRB.GetString (HateRaceTable.GetValue(Row, 0))
+		if info != "":
+			#TextAreaControl.Append("\n")
+			info = ": " + info + "\n"
+			TextAreaControl.Append(15982)
+			TextAreaControl.Append(info)
+
+def unsetMageSpells():
+	print("unsetMageSpells")
+	MyChar = GemRB.GetVar ("Slot")
+	
+	RemoveKnownSpells (MyChar, IE_SPELL_TYPE_WIZARD, 1, 5, 1)
+	GemRB.SetMemorizableSpellsCount(MyChar, 0, IE_SPELL_TYPE_WIZARD, 1)
+	
+	
+def guardMageSpells():
+	MyChar = GemRB.GetVar ("Slot")
+	Class = GemRB.GetPlayerStat(MyChar,IE_CLASS)
+	TmpTable = GemRB.LoadTableObject("clskills")
+	TableName = TmpTable.GetValue(Class, 2)
+	return TableName != "*"
+
+def getMageSpells(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	# arcane spells
+	info = ""
+	for level in range(0, 9):
+		for j in range(0, GemRB.GetKnownSpellsCount (MyChar, IE_SPELL_TYPE_WIZARD, level) ):
+			Spell = GemRB.GetKnownSpell (MyChar, IE_SPELL_TYPE_WIZARD, level, j)
+			Spell = GemRB.GetSpell (Spell['SpellResRef'], 1)['SpellName']
+			info += GemRB.GetString (Spell) + "\n"
+	if info != "":
+		info = "\n" + info + "\n"
+		TextAreaControl.Append (11027)
+		TextAreaControl.Append (info)
+
+def guardSkills():
+	SkillTable = GemRB.LoadTableObject("skills")
+	RowCount = SkillTable.GetRowCount()-2
+
+	MyChar = GemRB.GetVar ("Slot")
+	Kit = GemRB.GetPlayerStat (MyChar, IE_KIT)
+
+	if Kit != 0:
+		KitList = GemRB.LoadTableObject("kitlist")
+		KitName = KitList.GetValue(Kit, 0) #rowname is just a number
+		PointsLeft = SkillTable.GetValue("FIRST_LEVEL",KitName)
+		if PointsLeft < 0:
+			Kit = 0
+		
+	if Kit == 0:
+		ClassID = GemRB.GetPlayerStat (MyChar, IE_CLASS)
+		ClassIndex = ClassTable.FindValue(5,ClassID)
+		KitName = ClassTable.GetRowName(ClassIndex)
+
+	for i in range(RowCount):
+		SkillName = SkillTable.GetRowName(i+2)
+		if SkillTable.GetValue(SkillName, KitName)==1:
+			return True
+
+	return False
+		
+def unsetSkill():
+	from LUSkillsSelection import SkillsNullify,SkillsSave
+	MyChar = GemRB.GetVar ("Slot")
+	SkillsNullify ()
+	SkillsSave (MyChar)
+	
+def getSkills(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	# thieving and other skills
+	info = ""
+	SkillTable = GemRB.LoadTableObject ("skills")
+	ClassID = GemRB.GetPlayerStat (MyChar, IE_CLASS)
+	Class = ClassTable.FindValue (5, ClassID)
+	ClassName = ClassTable.GetRowName(Class)
+	RangerSkills = ClassSkillsTable.GetValue (ClassName, "RANGERSKILL")
+	BardSkills = ClassSkillsTable.GetValue (ClassName, "BARDSKILL")
+	KitName = GetKitIndex (MyChar)
+	if KitName == 0:
+		KitName = ClassName
+	else:
+		KitName = KitListTable.GetValue (KitName, 0)
+		
+	if SkillTable.GetValue ("RATE", KitName) != -1 or BardSkills != "*" or RangerSkills != "*":
+		for skill in range(SkillTable.GetRowCount () - 2):
+			name = GemRB.GetString (SkillTable.GetValue (skill+2, 1))
+			id = SkillTable.GetValue (skill+2, 2)
+			available = SkillTable.GetValue (SkillTable.GetRowName (skill+2), KitName)
+			value = GemRB.GetPlayerStat(MyChar,id)
+			if value >= 0 and available != -1:
+				info += name + ": " + str(value) + "\n"
+				
+	if info != "":
+		info = "\n" + info + "\n"
+		TextAreaControl.Append("\n")
+		TextAreaControl.Append (8442)
+		TextAreaControl.Append (info)
+	
+def unsetProfi():
+	from GUICG9 import ProfsNullify,ProfsSave
+	MyChar = GemRB.GetVar ("Slot")
+	ProfsNullify ()
+	ProfsSave(MyChar)
+
+def getProfi(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	# weapon proficiencies
+	TextAreaControl.Append ("\n")
+	TextAreaControl.Append (9466)
+	TextAreaControl.Append ("\n")
+	TmpTable=GemRB.LoadTableObject ("weapprof")
+	ProfCount = TmpTable.GetRowCount ()
+	#bg2 weapprof.2da contains the bg1 proficiencies too, skipping those
+	for i in range(ProfCount):
+		# 4294967296 overflows to -1 on some arches, so we use a smaller invalid strref
+		id = TmpTable.GetValue (i, 0)+IE_PROFICIENCYBASTARDSWORD
+		Weapon = GemRB.GetString (TmpTable.GetValue (i, 1))
+		Value = GemRB.GetPlayerStat (MyChar,id)
+		if Value:
+			pluses = " "
+			for plus in range(0, Value):
+				pluses += "+"
+			TextAreaControl.Append (Weapon + pluses + "\n")
+
+#Appearance
+def unsetColors():
+	MyChar = GemRB.GetVar ("Slot")
+	SetColorStat (MyChar, IE_HAIR_COLOR, 0 )
+	SetColorStat (MyChar, IE_SKIN_COLOR, 0 )
+	SetColorStat (MyChar, IE_MAJOR_COLOR, 0 )
+	SetColorStat (MyChar, IE_MINOR_COLOR, 0 )
+
+def unsetSounds():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerSound(MyChar,"")
+
+
+#name
+def unsetName():
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerName (MyChar, "", 0)
+	
+def getName(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	name = GemRB.GetPlayerName(MyChar)
+	if(name != ""):
+		TextAreaControl.Append(name + "\n")
+
+#divine spells
+def setDivineSpells():
+	MyChar = GemRB.GetVar ("Slot")
+	
+	ClassID = GemRB.GetPlayerStat (MyChar, IE_CLASS)
+	Class = ClassTable.FindValue (5, ClassID)
+	ClassName = ClassTable.GetRowName(Class)
+	
+	DruidTable = ClassSkillsTable.GetValue (ClassName, "DRUIDSPELL")
+	ClericTable = ClassSkillsTable.GetValue (ClassName, "CLERICSPELL")
+	
+	print("CGG setDivineSpells: CP1",ClassID,Class,ClassName,DruidTable,ClericTable)
+	
+	AllignID = GemRB.GetPlayerStat (MyChar, IE_ALIGNMENT)
+	
+	if ClericTable != "*":
+		learnDivine(MyChar,0x4000,ClericTable,AllignID)
+	if DruidTable != "*":
+		learnDivine(MyChar,0x8000,DruidTable,AllignID)
+		
+	return False
+
+def learnDivine(MyChar,ClassFlag,TableName,AllignID):
+	#print ("CGG setDivineSpells: CP2",MyChar,ClassFlag,TableName,AllignID )
+	SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_PRIEST, 1)
+	Learnable = GetLearnablePriestSpells( ClassFlag, AllignID, 1)
+	for i in range(len(Learnable) ):
+		#print ("CGG setDivineSpells: CP3",Learnable[i])
+		if -1 == HasSpell(MyChar,IE_SPELL_TYPE_PRIEST,1,Learnable[i]):
+			#print ("CGG setDivineSpells: CP4",Learnable[i])
+			GemRB.LearnSpell (MyChar, Learnable[i], 0)
+
+def unsetDivineSpells():
+	print("unsetDivineSpells")
+	MyChar = GemRB.GetVar ("Slot")
+	for level in range(0, 5):
+		for j in range(0, GemRB.GetKnownSpellsCount (MyChar, IE_SPELL_TYPE_PRIEST, level) ):
+			GemRB.RemoveSpell(MyChar,IE_SPELL_TYPE_PRIEST, level, 0)
+	GemRB.SetMemorizableSpellsCount(MyChar, 0, IE_SPELL_TYPE_PRIEST, 1)
+			
+
+def getDivineSpells(TextAreaControl):
+	MyChar = GemRB.GetVar ("Slot")
+	# divine spells
+	info = ""
+	for level in range(0, 7):
+		for j in range(0, GemRB.GetKnownSpellsCount (MyChar, IE_SPELL_TYPE_PRIEST, level) ):
+			Spell = GemRB.GetKnownSpell (MyChar, IE_SPELL_TYPE_PRIEST, level, j)
+			Spell = GemRB.GetSpell (Spell['SpellResRef'], 1)['SpellName']
+			info += GemRB.GetString (Spell) + "\n"
+	if info != "":
+		info = "\n" + info + "\n"
+		TextAreaControl.Append (11028)
+		TextAreaControl.Append (info)
+		
+#finish
+def setAccept():	
+	#set my character up
+	MyChar = GemRB.GetVar ("Slot")
+
+	ClassID = GemRB.GetPlayerStat (MyChar, IE_CLASS)
+	Class = ClassTable.FindValue (5, ClassID)
+	ClassName = ClassTable.GetRowName(Class)
+	
+	#reputation
+	AllignID = GemRB.GetPlayerStat (MyChar, IE_ALIGNMENT)
+	
+	TmpTable=GemRB.LoadTableObject ("repstart")
+	AlignmentTable = GemRB.LoadTableObject ("aligns")
+	t = TmpTable.GetValue (AllignID,0) * 10
+	GemRB.SetPlayerStat (MyChar, IE_REPUTATION, t)
+
+	#slot 1 is the protagonist
+	if MyChar == 1:
+		GemRB.GameSetReputation( t )
+
+	#gold
+	TmpTable=GemRB.LoadTableObject ("strtgold")
+	t = GemRB.Roll (TmpTable.GetValue (ClassName,"ROLLS"),TmpTable.GetValue(ClassName,"SIDES"), TmpTable.GetValue (ClassName,"MODIFIER") )
+	GemRB.SetPlayerStat (MyChar, IE_GOLD, t*TmpTable.GetValue (ClassName,"MULTIPLIER") )
+
+	#set the base number of attacks; effects will add the proficiency bonus
+	GemRB.SetPlayerStat (MyChar, IE_NUMBEROFATTACKS, 2)
+
+	#colors
+	SetColorStat (MyChar, IE_METAL_COLOR, 0x1B )
+	SetColorStat (MyChar, IE_LEATHER_COLOR, 0x16 )
+	SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 )
+
+	#does all the rest
+	LargePortrait = GemRB.GetToken ("LargePortrait")
+	SmallPortrait = GemRB.GetToken ("SmallPortrait")
+	GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait)
+	#10 is a weapon slot (see slottype.2da row 10)
+	GemRB.CreateItem (MyChar, "staf01", 10, 1, 0, 0)
+	GemRB.SetEquippedQuickSlot (MyChar, 0)
+	#LETS PLAY!!
+	playmode = GemRB.GetVar ("PlayMode")
+	
+	CloseOtherWindow(None)
+	close()
+	
+	if playmode >=0:
+		GemRB.EnterGame()
+	else:
+		#leaving multi player pregen
+		GemRB.SetNextScript ("GUIMP")

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,29 +20,24 @@
 #character generation, gender (GUICG1)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
 GenderWindow = 0
 TextAreaControl = 0
 DoneButton = 0
 
 def OnLoad():
 	global GenderWindow, TextAreaControl, DoneButton
+
+	if CloseOtherWindow (OnLoad):
+		if(GenderWindow):
+			GenderWindow.Unload()
+			GenderWindow = None
+		return
 	
 	GemRB.LoadWindowPack("GUICG")
-	#this hack will redraw the base CG window
-	#GenderWindow = GemRB.LoadWindowObject(0)
-	#PortraitButton = GenderWindow.GetControl(12)
-	#PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-	#ImportButton = GenderWindow.GetControl(13)
-	#ImportButton.SetText(13955)
-	#ImportButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	#CancelButton = GenderWindow.GetControl(15)
-	#CancelButton.SetText(13727)
-	#CancelButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	#GenderWindow.SetVisible(1)
-	#GemRB.DrawWindows()
-	#GemRB.UnloadWindow(GenderWindow)
+	
 	GenderWindow = GemRB.LoadWindowObject(1)
 
 	BackButton = GenderWindow.GetControl(6)
@@ -59,7 +54,8 @@
 
 	FemaleButton = GenderWindow.GetControl(3)
 	FemaleButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
-
+	
+	GemRB.SetVar("Gender",0)
 	MaleButton.SetVarAssoc("Gender",1)
 	FemaleButton.SetVarAssoc("Gender",2)
 	MaleButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"ClickedMale")
@@ -67,7 +63,7 @@
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
-	GenderWindow.SetVisible(1)
+	GenderWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def ClickedMale():
@@ -80,15 +76,10 @@
 	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
-def BackPress():
-	if GenderWindow:
-		GenderWindow.Unload()
-	GemRB.SetNextScript("CharGen")
-	GemRB.SetVar("Gender",0)  #scrapping the gender value
-	return
-
 def NextPress():
-	if GenderWindow:
-		GenderWindow.Unload()
-	GemRB.SetNextScript("GUICG12") 
+	MyChar = GemRB.GetVar ("Slot")
+	#GemRB.CreatePlayer ("charbase", MyChar | 0x8000 )
+	Gender = GemRB.GetVar ("Gender")
+	GemRB.SetPlayerStat (MyChar, IE_SEX, Gender)
+	next()
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -19,7 +19,10 @@
 #
 #character generation, multi-class (GUICG10)
 import GemRB
+from GUICommon import CloseOtherWindow
 
+from CharGenCommon import * 
+
 ClassWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -28,11 +31,14 @@
 def OnLoad():
 	global ClassWindow, TextAreaControl, DoneButton
 	global ClassTable
-	
+
 	GemRB.LoadWindowPack("GUICG")
+	ClassWindow = GemRB.LoadWindowObject(10)
+
+	CloseOtherWindow (ClassWindow.Unload)
+
 	ClassTable = GemRB.LoadTableObject("classes")
 	ClassCount = ClassTable.GetRowCount()+1
-	ClassWindow = GemRB.LoadWindowObject(10)
 	TmpTable=GemRB.LoadTableObject("races")
 	RaceName = TmpTable.GetRowName(GemRB.GetVar("Race")-1 )
 
@@ -78,7 +84,7 @@
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
-	ClassWindow.SetVisible(1)
+	ClassWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def ClassPress():
@@ -87,15 +93,10 @@
 	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
-def BackPress():
-	GemRB.SetVar("Class",0)  # scrapping it
-	if ClassWindow:
-		ClassWindow.Unload()
-	GemRB.SetNextScript("GUICG2")
-	return
-
 def NextPress():
-	if ClassWindow:
-		ClassWindow.Unload()
-	GemRB.SetNextScript("CharGen4") #alignment
-	return
+	#class	
+	ClassIndex = GemRB.GetVar ("Class")-1
+	Class = ClassTable.GetValue (ClassIndex, 5)
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_CLASS, Class)
+	next()
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, appearance (GUICG12)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 AppearanceWindow = 0
 CustomWindow = 0
 PortraitButton = 0
@@ -37,11 +41,17 @@
 def OnLoad():
 	global AppearanceWindow, PortraitButton, PortraitsTable, LastPortrait
 	global Gender
-	
-	Gender=GemRB.GetVar ("Gender")
 
+	if CloseOtherWindow (OnLoad):
+		if(AppearanceWindow):AppearanceWindow.Unload()
+		AppearanceWindow = None
+		return
+
 	GemRB.LoadWindowPack("GUICG")
 	AppearanceWindow = GemRB.LoadWindowObject (11)
+	
+	#Load the Gender
+	Gender=GemRB.GetVar ("Gender")
 
 	#Load the Portraits Table
 	PortraitsTable = GemRB.LoadTableObject ("PICTURES")
@@ -74,7 +84,7 @@
 			SetPicture ()
 			break
 		LastPortrait = LastPortrait + 1
-	AppearanceWindow.SetVisible (1)
+	AppearanceWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def RightPress():
@@ -97,13 +107,6 @@
 			SetPicture ()
 			return
 
-def BackPress():
-	if AppearanceWindow:
-		AppearanceWindow.Unload ()
-	GemRB.SetNextScript ("GUICG1")
-	GemRB.SetVar ("Gender",0) #scrapping the gender value
-	return
-
 def CustomDone():
 	Window = CustomWindow
 
@@ -115,7 +118,7 @@
 		Window.Unload ()
 	if AppearanceWindow:
 		AppearanceWindow.Unload ()
-	GemRB.SetNextScript ("CharGen2")
+	next()
 	return
 
 def CustomAbort():
@@ -210,11 +213,19 @@
 	return
 
 def NextPress():
-	if AppearanceWindow:
-		AppearanceWindow.Unload ()
 	PortraitTable = GemRB.LoadTableObject ("pictures")
 	PortraitName = PortraitTable.GetRowName (LastPortrait )
 	GemRB.SetToken ("SmallPortrait", PortraitName+"S")
 	GemRB.SetToken ("LargePortrait", PortraitName+"L")
-	GemRB.SetNextScript ("CharGen2") #Before race
-	return
+	next()
+	#GemRB.SetVar("Step",1)
+	#GemRB.SetNextScript("CharGen")
+	#GemRB.SetNextScript ("CharGen2") #Before race
+	#return
+
+#def BackPress():
+#	if AppearanceWindow:
+#		AppearanceWindow.Unload ()
+#	GemRB.SetNextScript ("GUICG1")
+	#GemRB.SetVar ("Gender",0) #scrapping the gender value
+#	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, color (GUICG13)
 import GemRB
 
+from CharGenCommon import *
+from GUICommon import CloseOtherWindow
+
+
 global IE_ANIM_ID
 ColorTable = 0
 ColorWindow = 0
@@ -59,6 +63,7 @@
 	
 	GemRB.LoadWindowPack("GUICG")
 	ColorWindow=GemRB.LoadWindowObject(13)
+	CloseOtherWindow (ColorWindow.Unload)
 
 	ColorTable = GemRB.LoadTableObject("clowncol")
 	#set these colors to some default
@@ -109,7 +114,7 @@
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	RefreshPDoll()
-	ColorWindow.SetVisible(1)
+	ColorWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def DonePress():
@@ -117,7 +122,8 @@
 
 	if ColorPicker:
 		ColorPicker.Unload()
-	ColorWindow.SetVisible(1)
+	
+	ColorWindow.ShowModal(MODAL_SHADOW_NONE)
 	PickedColor=ColorTable.GetValue(ColorIndex, GemRB.GetVar("Selected"))
 	if ColorIndex==0:
 		HairColor=PickedColor
@@ -165,7 +171,7 @@
 		Button.SetVarAssoc("Selected",i)
 		Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress")
 	
-	ColorPicker.SetVisible(1)
+	ColorPicker.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def HairPress():
@@ -204,18 +210,12 @@
 	GetColor()
 	return
 
-def BackPress():
-	if ColorWindow:
-		ColorWindow.Unload()
-	GemRB.SetNextScript("CharGen7")
-	return
 
 def NextPress():
-	if ColorWindow:
-		ColorWindow.Unload()
-	GemRB.SetVar("HairColor",HairColor)
-	GemRB.SetVar("SkinColor",SkinColor)
-	GemRB.SetVar("MinorColor",MinorColor)
-	GemRB.SetVar("MajorColor",MajorColor)
-	GemRB.SetNextScript("GUICG19") #sounds
+	MyChar = GemRB.GetVar ("Slot")
+	SetColorStat (MyChar, IE_HAIR_COLOR, HairColor )
+	SetColorStat (MyChar, IE_SKIN_COLOR, SkinColor )
+	SetColorStat (MyChar, IE_MAJOR_COLOR, MajorColor)
+	SetColorStat (MyChar, IE_MINOR_COLOR, MinorColor )
+	next()
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, racial enemy (GUICG15)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 RaceWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -50,15 +54,21 @@
 	global RaceWindow, TextAreaControl, DoneButton
 	global RaceTable, RaceCount, TopIndex
 
+	if CloseOtherWindow (OnLoad):
+		if(RaceWindow):
+			RaceWindow.Unload()
+			RaceWindow = None
+		return
+	
+	GemRB.SetVar ("HatedRace",0)
+	
 	ClassTable = GemRB.LoadTableObject("classes")
 	ClassRow = GemRB.GetVar("Class")-1
 	Class = ClassTable.GetValue(ClassRow, 5)
 	TmpTable = GemRB.LoadTableObject("clskills")
 	ClassName = TmpTable.GetRowName(Class)
 	TableName = TmpTable.GetValue(ClassName, "HATERACE")
-	if TableName == "*":
-		GemRB.SetNextScript("GUICG7")
-		return
+	
 	GemRB.LoadWindowPack("GUICG")
 	RaceWindow = GemRB.LoadWindowObject(15)
 	RaceTable = GemRB.LoadTableObject(TableName)
@@ -88,7 +98,7 @@
 
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	RaceWindow.SetVisible(1)
+	RaceWindow.ShowModal(MODAL_SHADOW_NONE)
 	DisplayRaces()
 	return
 
@@ -99,15 +109,7 @@
 	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
-def BackPress():
-	if RaceWindow:
-		RaceWindow.Unload()
-	GemRB.SetVar("HatedRace",0) #scrapping the race value
-	GemRB.SetNextScript("CharGen6")
-	return
-
 def NextPress():
-	if RaceWindow:
-		RaceWindow.Unload()
-	GemRB.SetNextScript("GUICG7") #mage spells
-	return
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_HATEDRACE, GemRB.GetVar ("HatedRace") )
+	next()
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,11 +20,21 @@
 #character generation, sounds (GUICG19)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 VoiceList = 0
 CharSoundWindow = 0
 
 def OnLoad():
 	global CharSoundWindow, VoiceList
+
+	if CloseOtherWindow (OnLoad):
+		if(CharSoundWindow):
+			CharSoundWindow.Unload()
+			CharSoundWindow = None
+		return
 	
 	GemRB.LoadWindowPack("GUICG", 640, 480)
 	CharSoundWindow=GemRB.LoadWindowObject(19)
@@ -55,7 +65,7 @@
 
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	CharSoundWindow.SetVisible(1)
+	CharSoundWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def PlayPress():
@@ -65,20 +75,11 @@
 	GemRB.PlaySound (CharSound+"a")
 	return
 
-def BackPress():
-	global CharSoundWindow
 
-	if CharSoundWindow:
-		CharSoundWindow.Unload()
-	GemRB.SetNextScript("GUICG13") 
-	return
-
 def NextPress():
 	global CharSoundWindow
-
 	CharSound = VoiceList.QueryText ()
-	GemRB.SetToken ("CharSound", CharSound)
-	if CharSoundWindow:
-		CharSoundWindow.Unload()
-	GemRB.SetNextScript("CharGen8") #name
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerSound(MyChar,CharSound)
+	next()
 	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,11 @@
 #character generation, class (GUICG2)
 import GemRB
 
+from CharGenCommon import * 
+
+from GUICommon import CloseOtherWindow
+
+
 ClassWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -28,7 +33,18 @@
 def OnLoad():
 	global ClassWindow, TextAreaControl, DoneButton
 	global ClassTable
+
+	if CloseOtherWindow (OnLoad):
+		if(ClassWindow):
+			ClassWindow.Unload()
+			ClassWindow = None
+		return
 	
+	GemRB.SetVar("Class",0)
+	GemRB.SetVar("Multi Class",0)
+	GemRB.SetVar("Specialist",0)
+	GemRB.SetVar("Class Kit",0)
+	
 	GemRB.LoadWindowPack("GUICG")
 	ClassTable = GemRB.LoadTableObject("classes")
 	ClassCount = ClassTable.GetRowCount()+1
@@ -96,23 +112,19 @@
 	SpecialistButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpecialistPress")
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	ClassWindow.SetVisible(1)
+	ClassWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def MultiClassPress():
-	if ClassWindow:
-		ClassWindow.Unload()
-	GemRB.SetVar("Class Kit",0)
-	GemRB.SetNextScript("GUICG10")
-	return
+	GemRB.SetVar("Multi Class",1)
+	next()
 
 def SpecialistPress():
-	if ClassWindow:
-		ClassWindow.Unload()
+	GemRB.SetVar("Specialist",1)
+
 	GemRB.SetVar("Class Kit", 0)
 	GemRB.SetVar("Class", 6)
-	GemRB.SetNextScript("GUICG22")
-	return
+	next()
 	
 def ClassPress():
 	Class = GemRB.GetVar("Class")-1
@@ -120,15 +132,14 @@
 	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
-def BackPress():
-	if ClassWindow:
-		ClassWindow.Unload()
-	GemRB.SetNextScript("CharGen3")
-	GemRB.SetVar("Class",0)  #scrapping the class value
-	return
-
 def NextPress():
-	if ClassWindow:
-		ClassWindow.Unload()
-	GemRB.SetNextScript("CharGen4") #alignment
-	return
+	# find the class from the class table
+	ClassIndex = GemRB.GetVar ("Class") - 1
+	Class = ClassTable.GetValue (ClassIndex, 5)
+	#protect against barbarians
+	ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class) )
+	
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_CLASS, Class)
+	next()
+	
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, class kit (GUICG22)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 KitWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -31,7 +35,13 @@
 def OnLoad():
 	global KitWindow, TextAreaControl, DoneButton
 	global KitList, ClassList, SchoolList, ClassID
-	
+
+	if CloseOtherWindow(OnLoad):
+		if(KitWindow):
+			KitWindow.Unload()
+			KitWindow = None
+		return
+
 	GemRB.LoadWindowPack("GUICG")
 	TmpTable = GemRB.LoadTableObject("races")
 	RaceName = TmpTable.GetRowName(GemRB.GetVar("Race")-1 )
@@ -100,8 +110,8 @@
 
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	KitPress()
-	KitWindow.SetVisible(1)
+	#KitPress()
+	KitWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def KitPress():
@@ -117,15 +127,13 @@
 	DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
 	return
 
-def BackPress():
-	GemRB.SetVar("Class Kit",0) #scrapping
-	if KitWindow:
-		KitWindow.Unload()
-	GemRB.SetNextScript("GUICG2")
-	return
-
 def NextPress():
-	if KitWindow:
-		KitWindow.Unload()
-	GemRB.SetNextScript("CharGen4") #abilities
-	return
+	#class	
+	ClassIndex = GemRB.GetVar ("Class")-1
+	ClassTable = GemRB.LoadTableObject("classes")
+	Class = ClassTable.GetValue (ClassIndex, 5)
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerStat (MyChar, IE_CLASS, Class)
+	KitIndex = GemRB.GetVar ("Class Kit")
+	GemRB.SetPlayerStat (MyChar, IE_KIT, KitIndex)
+	next()
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, alignment (GUICG3)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 AlignmentWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -28,6 +32,14 @@
 def OnLoad():
 	global AlignmentWindow, TextAreaControl, DoneButton
 	global AlignmentTable
+
+	if CloseOtherWindow (OnLoad):
+		if(AlignmentWindow):
+			AlignmentWindow.Unload()
+			AlignmentWindow = None
+		return
+
+	GemRB.SetVar("Alignment",-1)
 	
 	ClassTable = GemRB.LoadTableObject("classes")
 	Class = GemRB.GetVar("Class")-1
@@ -71,7 +83,7 @@
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
-	AlignmentWindow.SetVisible(1)
+	AlignmentWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
 def AlignmentPress():
@@ -81,15 +93,8 @@
 	GemRB.SetVar("Alignment",AlignmentTable.GetValue(Alignment,3) )
 	return
 
-def BackPress():
-	if AlignmentWindow:
-		AlignmentWindow.Unload()
-	GemRB.SetNextScript("CharGen4")
-	GemRB.SetVar("Alignment",-1)  #scrapping the alignment value
-	return
-
 def NextPress():
-	if AlignmentWindow:
-		AlignmentWindow.Unload()
-	GemRB.SetNextScript("CharGen5") #appearance
-	return
+	MyChar = GemRB.GetVar ("Slot")
+	Alignment = GemRB.GetVar ("Alignment")
+	GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, Alignment)
+	next()
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,6 +20,10 @@
 #character generation, ability (GUICG4)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 AbilityWindow = 0
 TextAreaControl = 0
 DoneButton = 0
@@ -101,17 +105,21 @@
 	global AbilityTable
 	global KitIndex, Minimum, Maximum
 
-	#Kit = GemRB.GetVar("Class Kit")
-	#if Kit == 0:
+	if CloseOtherWindow (OnLoad):
+		if(AbilityWindow):
+			AbilityWindow.Unload()
+			AbilityWindow = None
+		return
+
+	AbilityTable = GemRB.LoadTableObject ("ability")
+	AbilityCount = AbilityTable.GetRowCount ()
+	
+	Abclasrq = GemRB.LoadTableObject("ABCLASRQ")
+
+	
 	ClassTable = GemRB.LoadTableObject("classes")
 	Class = GemRB.GetVar("Class")-1
 	KitName = ClassTable.GetRowName(Class)
-	#else:
-	#	KitList = GemRB.LoadTableObject("kitlist")
-		#rowname is just a number, first value row what we need here
-	#	KitName = KitList.GetValue(Kit, 0) 
-
-	Abclasrq = GemRB.LoadTableObject("ABCLASRQ")
 	KitIndex = Abclasrq.GetRowIndex(KitName)
 
 	GemRB.LoadWindowPack("GUICG", 640, 480)
@@ -154,7 +162,8 @@
 	RerollButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"RollPress")
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
-	AbilityWindow.SetVisible(1)
+	AbilityWindow.ShowModal(MODAL_SHADOW_NONE)
+	GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND)
 	return
 
 def RightPress():
@@ -246,15 +255,20 @@
 	return
 
 def BackPress():
-	if AbilityWindow:
-		AbilityWindow.Unload()
-	GemRB.SetNextScript("CharGen5")
-	for i in range(6):
-		GemRB.SetVar("Ability "+str(i),0)  #scrapping the abilities
-	return
+	GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR)
+	back()
 
 def NextPress():
-	if AbilityWindow:
-		AbilityWindow.Unload()
-	GemRB.SetNextScript("CharGen6") #
-	return
+	GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR)
+	
+	MyChar = GemRB.GetVar ("Slot")
+	
+	AbilityTable = GemRB.LoadTableObject ("ability")
+	AbilityCount = AbilityTable.GetRowCount ()
+	
+	for i in range (AbilityCount):
+		StatID = AbilityTable.GetValue (i, 3)
+		StatValue = GemRB.GetVar ("Ability "+str(i))
+		GemRB.SetPlayerStat (MyChar, StatID, StatValue)
+	next()
+

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,12 +20,22 @@
 #character generation, name (GUICG5)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+
+
 NameWindow = 0
 NameField = 0
 DoneButton = 0
 
 def OnLoad():
 	global NameWindow, NameField, DoneButton
+
+	if CloseOtherWindow (OnLoad):
+		if(NameWindow):
+			NameWindow.Unload()
+			NameWindow = None
+		return
 	
 	GemRB.LoadWindowPack("GUICG")
 	NameWindow = GemRB.LoadWindowObject(5)
@@ -43,24 +53,17 @@
 	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
 	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
 	NameField.SetEvent(IE_GUI_EDIT_ON_CHANGE,"EditChange")
-	NameWindow.SetVisible(1)
+	NameWindow.ShowModal(MODAL_SHADOW_NONE)
 	NameField.SetStatus(IE_GUI_CONTROL_FOCUSED)
 	return
 
-def BackPress():
-	if NameWindow:
-		NameWindow.Unload()
-	GemRB.SetNextScript("CharGen8")
-	return
-
 def NextPress():
 	Name = NameField.QueryText()
 	#check length?
 	#seems like a good idea to store it here for the time being
-	GemRB.SetToken("CHARNAME",Name) 
-	if NameWindow:
-		NameWindow.Unload()
-	GemRB.SetNextScript("CharGen9")
+	MyChar = GemRB.GetVar ("Slot")
+	GemRB.SetPlayerName (MyChar, Name, 0)
+	next()
 	return
 
 def EditChange():

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,188 +20,57 @@
 #character generation, skills (GUICG6)
 import GemRB
 
+from CharGenCommon import * 
+from GUICommon import CloseOtherWindow
+from LUSkillsSelection import *
+
+
 SkillWindow = 0
 TextAreaControl = 0
 DoneButton = 0
-SkillTable = 0
-TopIndex = 0
-PointsLeft = 0
-RowCount = 0
 
 def RedrawSkills():
 	global TopIndex
-
-	if PointsLeft == 0:
+	if GemRB.GetVar ("SkillPointsLeft") == 0:
 		DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
-
-	SumLabel = SkillWindow.GetControl(0x10000005)
-	SumLabel.SetText(str(PointsLeft) )
-
-	for i in range(4):
-		Pos=TopIndex+i
-		SkillName = SkillTable.GetValue(Pos+2,1)
-		Label = SkillWindow.GetControl(0x10000006+i)
-		Label.SetText(SkillName)
-
-		SkillName=SkillTable.GetRowName(Pos+2)
-		Ok=SkillTable.GetValue(SkillName, KitName)
-		Button1 = SkillWindow.GetControl(i*2+11)
-		Button2 = SkillWindow.GetControl(i*2+12)
-		if Ok == 0:
-			Button1.SetState(IE_GUI_BUTTON_DISABLED)
-			Button2.SetState(IE_GUI_BUTTON_DISABLED)
-			Button1.SetFlags(IE_GUI_BUTTON_NO_IMAGE,OP_OR)
-			Button2.SetFlags(IE_GUI_BUTTON_NO_IMAGE,OP_OR)
-		else:
-			Button1.SetState(IE_GUI_BUTTON_ENABLED)
-			Button2.SetState(IE_GUI_BUTTON_ENABLED)
-			Button1.SetFlags(IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
-			Button2.SetFlags(IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
-
-		Label = SkillWindow.GetControl(0x10000001+i)
-		ActPoint = GemRB.GetVar("Skill "+str(Pos) )
-		Label.SetText(str(ActPoint) )
-
+	else:
+		DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
 	return
 
-#def ScrollBarPress():
-#	global TopIndex
-#
-#	TopIndex = GemRB.GetVar("TopIndex")
-#	RedrawSkills()
-#	return
-
 def OnLoad():
-	global SkillWindow, TextAreaControl, DoneButton, TopIndex
-	global SkillTable, PointsLeft, KitName, RowCount
-	
-	SkillTable = GemRB.LoadTableObject("skills")
-	RowCount = SkillTable.GetRowCount()-2
+	global SkillWindow, DoneButton
 
-	Kit = GemRB.GetVar("Class Kit")
-	if Kit != 0:
-		KitList = GemRB.LoadTableObject("kitlist")
-		KitName = KitList.GetValue(Kit, 0) #rowname is just a number
-		PointsLeft = SkillTable.GetValue("FIRST_LEVEL",KitName)
-		if PointsLeft < 0:
-			Kit = 0
-		
-	if Kit == 0:
-		ClassTable = GemRB.LoadTableObject("classes")
-		Class = GemRB.GetVar("Class")-1
-		KitName = ClassTable.GetRowName(Class)
-	else:
-		KitList = GemRB.LoadTableObject("kitlist")
-		KitName = KitList.GetValue(Kit, 0) #rowname is just a number
-
-	SkillRacTable = GemRB.LoadTableObject("SKILLRAC")
-	RaceTable = GemRB.LoadTableObject("RACES")
-	RaceName = RaceTable.GetRowName(GemRB.GetVar("Race")-1)
-
-	Ok=0
-	for i in range(RowCount):
-		SkillName = SkillTable.GetRowName(i+2)
-		if SkillTable.GetValue(SkillName, KitName)==1:
-			b=SkillRacTable.GetValue(RaceName, SkillName)
-			GemRB.SetVar("Skill "+str(i),b)
-			Ok=1
-		else:
-			GemRB.SetVar("Skill "+str(i),0)
-
-	if Ok==0:  #skipping 
-		GemRB.SetNextScript("GUICG9")
+	if CloseOtherWindow (OnLoad):
+		if(SkillWindow):
+			SkillWindow.Unload()
+			SkillWindow = None
 		return
-	
-	Level = GemRB.GetVar("Level")
-	PointsLeft = SkillTable.GetValue("FIRST_LEVEL",KitName)
-	if Level>1:
-		PointsLeft = PointsLeft + SkillTable.GetValue("RATE",KitName)*(Level-1)
 
-	GemRB.SetToken("number",str(PointsLeft) )
-
 	GemRB.LoadWindowPack("GUICG")
-	SkillTable = GemRB.LoadTableObject("skills")
 	SkillWindow = GemRB.LoadWindowObject(6)
 
-	for i in range(4):
-		Button = SkillWindow.GetControl(i+21)
-		Button.SetVarAssoc("Skill",i)
-		Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "JustPress")
+	MyChar = GemRB.GetVar ("Slot")
 
-		Button = SkillWindow.GetControl(i*2+11)
-		Button.SetVarAssoc("Skill",i)
-		Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LeftPress")
-
-		Button = SkillWindow.GetControl(i*2+12)
-		Button.SetVarAssoc("Skill",i)
-		Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "RightPress")
-
+	Levels = [GemRB.GetPlayerStat (MyChar, IE_LEVEL), \
+			GemRB.GetPlayerStat (MyChar, IE_LEVEL2), \
+			GemRB.GetPlayerStat (MyChar, IE_LEVEL3)]
+	SetupSkillsWindow (MyChar, LUSKILLS_TYPE_CHARGEN, SkillWindow, RedrawSkills, [0,0,0], Levels,0,False)
+	
 	BackButton = SkillWindow.GetControl(25)
 	BackButton.SetText(15416)
+	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
+
 	DoneButton = SkillWindow.GetControl(0)
 	DoneButton.SetText(11973)
 	DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR)
-
-	TextAreaControl = SkillWindow.GetControl(19)
-	TextAreaControl.SetText(17248)
-
-	GemRB.SetVar("TopIndex",0)
-	#ScrollBarControl = SkillWindow.GetControl(26)
-	#ScrollBarControl.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE,"ScrollBarPress")
-	#ScrollBarControl.SetVarAssoc("TopIndex",RowCount-3)
-
-	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")
-	BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress")
+	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress")	
 	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
-	TopIndex = 0
-	RedrawSkills()
-	SkillWindow.SetVisible(1)
-	return
 
-
-def JustPress():
-	Pos = GemRB.GetVar("Skill")+TopIndex
-	TextAreaControl.SetText(SkillTable.GetValue(Pos+2,0) )
-	return
-
-def RightPress():
-	global PointsLeft
-
-	Pos = GemRB.GetVar("Skill")+TopIndex
-	TextAreaControl.SetText(SkillTable.GetValue(Pos+2,0) )
-	ActPoint = GemRB.GetVar("Skill "+str(Pos) )
-	if ActPoint <= 0:
-		return
-	GemRB.SetVar("Skill "+str(Pos),ActPoint-1)
-	PointsLeft = PointsLeft + 1
 	RedrawSkills()
+	SkillWindow.ShowModal(MODAL_SHADOW_NONE)
 	return
 
-def LeftPress():
-	global PointsLeft
-
-	Pos = GemRB.GetVar("Skill")+TopIndex
-	TextAreaControl.SetText(SkillTable.GetValue(Pos+2,0) )
-	if PointsLeft == 0:
-		return
-	ActPoint = GemRB.GetVar("Skill "+str(Pos) )
-	if ActPoint >= 200:
-		return
-	GemRB.SetVar("Skill "+str(Pos), ActPoint+1)
-	PointsLeft = PointsLeft - 1
-	RedrawSkills()
-	return
-
-def BackPress():
-	if SkillWindow:
-		SkillWindow.Unload()
-	GemRB.SetNextScript("CharGen6")
-	for i in range(RowCount):
-		GemRB.SetVar("Skill "+str(i), 0)
-	return
-
 def NextPress():
-	if SkillWindow:
-		SkillWindow.Unload()
-	GemRB.SetNextScript("GUICG9") #weapon proficiencies
-	return
+	MyChar = GemRB.GetVar ("Slot")
+	SkillsSave(MyChar)
+	next()
\ No newline at end of file

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py	2009-06-22 19:57:22 UTC (rev 6584)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py	2009-06-22 20:01:07 UTC (rev 6585)
@@ -20,116 +20,42 @@
 # character generation, mage spells (GUICG7)
 
 import GemRB
-from GUICommon import GetLearnableMageSpells, GetLearnablePriestSpells
+from GUICommon import GetLearnableMageSpells, GetLearnablePriestSpells,CloseOtherWindow
+from CharGenCommon import * 
+from LUSpellSelection import *
 
-MageSpellsWindow = 0
-MageSpellsTextArea = 0
-DoneButton = 0
-Learnable = []
-
 def OnLoad():
-	global MageSpellsWindow, MageSpellsTextArea, DoneButton
-	global MageSpellsSelectPointsLeft, Learnable
-	
-	AlignmentTable = GemRB.LoadTableObject("aligns")
-	ClassTable = GemRB.LoadTableObject("classes")
-	ClassRow = GemRB.GetVar("Class")-1
-	Class = ClassTable.GetValue(ClassRow, 5)
-	TmpTable = GemRB.LoadTableObject("clskills")
-	TableName = TmpTable.GetValue(Class, 2)
-	if TableName == "*":
-		GemRB.SetNextScript("GUICG6")
-		return
+	KitTable = GemRB.LoadTableObject("magesch")
+	Slot = GemRB.GetVar ("Slot")
+	Class = GemRB.GetPlayerStat (Slot, IE_CLASS)
+	TableName = ClassSkillsTable.GetValue(Class, 2)
 
-	GemRB.LoadWindowPack("GUICG")
-	MageSpellsWindow = GemRB.LoadWindowObject(7)
-	v = GemRB.GetVar("Alignment")
-	Learnable = GetLearnableMageSpells( GemRB.GetVar("Class Kit"), v, 1)
-	GemRB.SetVar("MageSpellBook", 0)
-	GemRB.SetVar("SpellMask", 0)
+	# make sure we have a correct table
+	if Class == 19:
+		# sorcerer's need their known not max table
+		TableName = "SPLSRCKN"
 
-	MageSpellsSelectPointsLeft = 2
-	PointsLeftLabel = MageSpellsWindow.GetControl(0x1000001b)
-	PointsLeftLabel.SetUseRGB(1)
-	PointsLeftLabel.SetText(str(MageSpellsSelectPointsLeft))
+	# get our kit index
+	KitIndex = GetKitIndex (Slot)
+	if KitIndex:
+		KitValue = KitTable.GetValue(KitIndex - 21, 3)
 
-	for i in range (24):
-		SpellButton = MageSpellsWindow.GetControl(i + 2)
-		SpellButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_CHECKBOX, OP_OR)
-		SpellButton.SetSprites("GUIBTBUT", 0, (i % 12) * 2, (i % 12) * 2 + 1, (i % 12) * 2 + 24, (i % 12) * 2 + 25)
-		if i < len(Learnable):
-			Spell = GemRB.GetSpell(Learnable[i])
-			SpellButton.SetSpellIcon(Learnable[i], 1)
-			SpellButton.SetState(IE_GUI_BUTTON_ENABLED)
-			SpellButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MageSpellsSelectPress")
-			SpellButton.SetVarAssoc("SpellMask", 1 << i)
-			SpellButton.SetTooltip(Spell['SpellName'])
-		else:
-			SpellButton.SetState(IE_GUI_BUTTON_DISABLED)
-
-	GemRB.SetToken("number", str(MageSpellsSelectPointsLeft))
-	MageSpellsTextArea = MageSpellsWindow.GetControl(27)
-	MageSpellsTextArea.SetText(17250)
-
-	DoneButton = MageSpellsWindow.GetControl(0)
-	DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
-	DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MageSpellsDonePress")
-	DoneButton.SetText(11973)
-	DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR)
-
-	MageSpellsCancelButton = MageSpellsWindow.GetControl(29)
-	MageSpellsCancelButton.SetState(IE_GUI_BUTTON_ENABLED)
-	MageSpellsCancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MageSpellsCancelPress")
-	MageSpellsCancelButton.SetText(13727)
-
-	MageSpellsWindow.SetVisible(1)
-	return
-
-def MageSpellsSelectPress():
-	global MageSpellsWindow, MageSpellsTextArea, DoneButton
-	global MageSpellsSelectPointsLeft, Learnable
-
-	MageSpellBook = GemRB.GetVar("MageSpellBook")
-	SpellMask = GemRB.GetVar("SpellMask")
-	Spell = abs(MageSpellBook - SpellMask)
-
-	i = -1
-	while (Spell > 0):
-		i = i + 1
-		Spell = Spell >> 1
-
-	Spell = GemRB.GetSpell(Learnable[i])
-	MageSpellsTextArea.SetText(Spell["SpellDesc"])
-	if SpellMask < MageSpellBook:
-		MageSpellsSelectPointsLeft = MageSpellsSelectPointsLeft + 1
-		for i in range (len(Learnable)):
-			SpellButton = MageSpellsWindow.GetControl(i + 2)
-			if (((1 << i) & SpellMask) == 0):
-				SpellButton.SetState(IE_GUI_BUTTON_ENABLED)
-		DoneButton.SetState(IE_GUI_BUTTON_DISABLED)
+		# bards have kits too
+		if KitValue == -1:
+			KitValue = 0x4000 # we only need it for the spells, so this is ok
 	else:
-		MageSpellsSelectPointsLeft = MageSpellsSelectPointsLeft - 1
-		if MageSpellsSelectPointsLeft == 0:
-			for i in range (len(Learnable)):
-				SpellButton = MageSpellsWindow.GetControl(i + 2)
-				if ((1 << i) & SpellMask) == 0:
-					SpellButton.SetState(IE_GUI_BUTTON_DISABLED)
-			DoneButton.SetState(IE_GUI_BUTTON_ENABLED)
+		KitValue = 0x4000
 
-	PointsLeftLabel = MageSpellsWindow.GetControl(0x1000001b)
-	PointsLeftLabel.SetText(str(MageSpellsSelectPointsLeft))

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.