From: <ze...@us...> - 2009-03-22 18:54:43
|
Revision: 5823 http://gemrb.svn.sourceforge.net/gemrb/?rev=5823&view=rev Author: zefklop Date: 2009-03-22 18:54:33 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Apply 5819, 5820, 5821 and 5822 to bg2. Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-03-22 18:43:03 UTC (rev 5822) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-03-22 18:54:33 UTC (rev 5823) @@ -103,7 +103,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) @@ -127,6 +127,12 @@ 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/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-03-22 18:43:03 UTC (rev 5822) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-03-22 18:54:33 UTC (rev 5823) @@ -397,31 +397,18 @@ return def RemovePlayerConfirm (): - global ReformPartyWindow - - hideflag = GemRB.HideGUI () - if ReformPartyWindow: - ReformPartyWindow.Unload () - GemRB.SetVar ("OtherWindow", -1) - #removing selected player - ReformPartyWindow = None - if hideflag: - GemRB.UnhideGUI () - GemRB.LeaveParty (GemRB.GetVar("Selected") ) + slot = GemRB.GetVar("Selected") + if GemRB.GetPlayerStat(slot, IE_HITPOINTS) > 0: + GemRB.ExecuteString("Dialogue([PC])", slot) + GemRB.LeaveParty (slot ) OpenReformPartyWindow () return def RemovePlayerCancel (): - global ReformPartyWindow - - hideflag = GemRB.HideGUI () - if ReformPartyWindow: - ReformPartyWindow.Unload () - GemRB.SetVar ("OtherWindow", -1) - ReformPartyWindow = None - if hideflag: - GemRB.UnhideGUI () + #Once for getting rid of the confirmation window OpenReformPartyWindow () + #and once for reopening the reform party window + OpenReformPartyWindow () return def OpenReformPartyWindow (): @@ -445,6 +432,7 @@ 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. |