Menu
▾
▴
[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 GUICommonWindows.py,1.16,1.17 GUISTORE.py,1.20,1.21 MessageWindow.py,1.23,1.24 TextScreen.py,1.1,1.2
|
From: Laszlo T. <ave...@us...> - 2005-03-21 23:09:42
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6315/bg2 Modified Files: GUICommonWindows.py GUISTORE.py MessageWindow.py TextScreen.py Log Message: Updated scripts (stores now work in bg2/tob) Index: MessageWindow.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/MessageWindow.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** MessageWindow.py 20 Mar 2005 21:28:24 -0000 1.23 --- MessageWindow.py 21 Mar 2005 23:09:32 -0000 1.24 *************** *** 22,26 **** from GUICommonWindows import * - import GUICommonWindows from GUIJRNL import * from GUIMA import * --- 22,25 ---- *************** *** 46,55 **** GemRB.LoadWindowPack(GetWindowPack()) ActionsWindow = GemRB.LoadWindow(3) - #PortraitWindow = GemRB.LoadWindow(1) OptionsWindow = GemRB.LoadWindow(0) MessageWindow = GemRB.LoadWindow(4) ! #fixme ugly ! OpenPortraitWindow() ! PortraitWindow = GUICommonWindows.PortraitWindow MessageTA = GemRB.GetControl(MessageWindow, 3) GemRB.SetTextAreaFlags(MessageWindow, MessageTA, IE_GUI_TEXTAREA_AUTOSCROLL) --- 45,52 ---- GemRB.LoadWindowPack(GetWindowPack()) ActionsWindow = GemRB.LoadWindow(3) OptionsWindow = GemRB.LoadWindow(0) MessageWindow = GemRB.LoadWindow(4) ! PortraitWindow = OpenPortraitWindow(1) ! MessageTA = GemRB.GetControl(MessageWindow, 3) GemRB.SetTextAreaFlags(MessageWindow, MessageTA, IE_GUI_TEXTAREA_AUTOSCROLL) *************** *** 63,67 **** GemRB.SetEvent(ActionsWindow, Button, IE_GUI_BUTTON_ON_PRESS, "MaximizePortraits") ! #GemRB.SetVar("PortraitWindow", PortraitWindow) GemRB.SetVar("ActionsWindow", ActionsWindow) GemRB.SetVar("OptionsWindow", OptionsWindow) --- 60,64 ---- GemRB.SetEvent(ActionsWindow, Button, IE_GUI_BUTTON_ON_PRESS, "MaximizePortraits") ! GemRB.SetVar("PortraitWindow", PortraitWindow) GemRB.SetVar("ActionsWindow", ActionsWindow) GemRB.SetVar("OptionsWindow", OptionsWindow) *************** *** 70,74 **** GemRB.SetVar("OtherWindow", -1) GemRB.SetVar("FloatWindow", -1) ! #GemRB.SetVar("PortraitPosition", 2) #Right GemRB.SetVar("ActionsPosition", 4) #BottomAdded GemRB.SetVar("OptionsPosition", 0) #Left --- 67,71 ---- GemRB.SetVar("OtherWindow", -1) GemRB.SetVar("FloatWindow", -1) ! GemRB.SetVar("PortraitPosition", 2) #Right GemRB.SetVar("ActionsPosition", 4) #BottomAdded GemRB.SetVar("OptionsPosition", 0) #Left *************** *** 86,90 **** GemRB.SetVisible(ActionsWindow, 1) - #GemRB.SetVisible(PortraitWindow, 0) GemRB.SetVisible(OptionsWindow, 0) GemRB.SetVisible(MessageWindow, 1) --- 83,86 ---- Index: TextScreen.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/TextScreen.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TextScreen.py 20 Mar 2005 23:36:46 -0000 1.1 --- TextScreen.py 21 Mar 2005 23:09:32 -0000 1.2 *************** *** 58,63 **** GemRB.SetEvent (TextScreen, Button, IE_GUI_BUTTON_ON_PRESS, "ReplayTextScreen") - GemRB.SetVisible (TextScreen, 1) GemRB.HideGUI () def ReplayTextScreen (): --- 58,64 ---- GemRB.SetEvent (TextScreen, Button, IE_GUI_BUTTON_ON_PRESS, "ReplayTextScreen") GemRB.HideGUI () + GemRB.SetVisible (0, 0) #removing the gamecontrol screen + GemRB.SetVisible (TextScreen, 1) def ReplayTextScreen (): *************** *** 71,74 **** --- 72,76 ---- GemRB.SetVisible (TextScreen, 0) GemRB.UnloadWindow (TextScreen) + GemRB.SetVisible (0, 1) #enabling gamecontrol screen GemRB.UnhideGUI () Index: GUICommonWindows.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICommonWindows.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GUICommonWindows.py 20 Mar 2005 15:47:11 -0000 1.16 --- GUICommonWindows.py 21 Mar 2005 23:09:32 -0000 1.17 *************** *** 180,202 **** SelectionChangeHandler () ! def OpenPortraitWindow (): global PortraitWindow PortraitWindow = Window = GemRB.LoadWindow(1) - GemRB.SetVar ("PortraitWindow", PortraitWindow) - GemRB.SetVar ("PortraitPosition", 2) # Right ! Button=GemRB.GetControl(PortraitWindow, 8) ! GemRB.SetEvent(PortraitWindow, Button, IE_GUI_BUTTON_ON_PRESS, "MinimizePortraits") ! # AI ! Button = GemRB.GetControl (Window, 6) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") - #Select All - Button = GemRB.GetControl (Window, 7) - GemRB.SetTooltip (Window, Button, 10485) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress") for i in range (PARTY_SIZE): Button = GemRB.GetControl (Window, i) --- 180,202 ---- SelectionChangeHandler () ! def OpenPortraitWindow (needcontrols): global PortraitWindow PortraitWindow = Window = GemRB.LoadWindow(1) ! if needcontrols: ! Button=GemRB.GetControl(PortraitWindow, 8) ! GemRB.SetEvent(PortraitWindow, Button, IE_GUI_BUTTON_ON_PRESS, "MinimizePortraits") ! # AI ! Button = GemRB.GetControl (Window, 6) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") ! ! #Select All ! Button = GemRB.GetControl (Window, 7) ! GemRB.SetTooltip (Window, Button, 10485) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress") for i in range (PARTY_SIZE): Button = GemRB.GetControl (Window, i) *************** *** 206,210 **** GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_DRAG_DROP, "OnDropItemToPC") - GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_ALIGN_BOTTOM|IE_GUI_BUTTON_ALIGN_LEFT|IE_GUI_BUTTON_PICTURE, OP_SET) GemRB.SetButtonBorder (Window, Button, FRAME_PC_SELECTED, 1, 1, 2, 2, 0, 255, 0, 255) --- 206,209 ---- *************** *** 214,218 **** UpdatePortraitWindow () ! return def UpdatePortraitWindow (): --- 213,217 ---- UpdatePortraitWindow () ! return Window def UpdatePortraitWindow (): *************** *** 223,230 **** pic = GemRB.GetPlayerPortrait (i+1,1) if not pic: ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) continue ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonPicture(Window, Button, pic) hp = GemRB.GetPlayerStat (i+1, IE_HITPOINTS) --- 222,229 ---- pic = GemRB.GetPlayerPortrait (i+1,1) if not pic: ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET) continue ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ALIGN_BOTTOM|IE_GUI_BUTTON_ALIGN_LEFT, OP_SET) GemRB.SetButtonPicture(Window, Button, pic) hp = GemRB.GetPlayerStat (i+1, IE_HITPOINTS) *************** *** 234,238 **** GemRB.SetTooltip (Window, Button, GemRB.GetPlayerName (i+1, 1) + "\n%d/%d" %(hp, hp_max)) - return def PortraitButtonOnPress (): --- 233,236 ---- *************** *** 266,280 **** # Run by Game class when selection was changed def SelectionChanged (): # FIXME: hack. If defined, display single selection if (not SelectionChangeHandler): ! for i in range (0, PARTY_SIZE): Button = GemRB.GetControl (PortraitWindow, i) GemRB.EnableButtonBorder (PortraitWindow, Button, FRAME_PC_SELECTED, GemRB.GameIsPCSelected (i + 1)) else: sel = GemRB.GameGetSelectedPCSingle () - for i in range (0, PARTY_SIZE): - Button = GemRB.GetControl (PortraitWindow, i) ! for i in range (0, PARTY_SIZE): Button = GemRB.GetControl (PortraitWindow, i) GemRB.EnableButtonBorder (PortraitWindow, Button, FRAME_PC_SELECTED, i + 1 == sel) --- 264,278 ---- # Run by Game class when selection was changed def SelectionChanged (): + global PortraitWindow + # FIXME: hack. If defined, display single selection if (not SelectionChangeHandler): ! for i in range (PARTY_SIZE): Button = GemRB.GetControl (PortraitWindow, i) GemRB.EnableButtonBorder (PortraitWindow, Button, FRAME_PC_SELECTED, GemRB.GameIsPCSelected (i + 1)) else: sel = GemRB.GameGetSelectedPCSingle () ! for i in range (PARTY_SIZE): Button = GemRB.GetControl (PortraitWindow, i) GemRB.EnableButtonBorder (PortraitWindow, Button, FRAME_PC_SELECTED, i + 1 == sel) *************** *** 306,313 **** SaveName2 = GemRB.GetTableValue (ClassTable, Class, 3) Class = 0 #fighter - print "SaveName2", SaveName2 SaveName1 = GemRB.GetTableValue (ClassTable, Class, 3) - print "SaveName1", SaveName1 for row in range(5): --- 304,309 ---- *************** *** 318,322 **** tmp1=tmp2 GemRB.SetPlayerStat (pc, IE_SAVEVSDEATH+row, tmp1) - print "Savingthrow:", tmp1 return --- 314,317 ---- Index: GUISTORE.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUISTORE.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** GUISTORE.py 20 Mar 2005 23:36:45 -0000 1.20 --- GUISTORE.py 21 Mar 2005 23:09:32 -0000 1.21 *************** *** 26,36 **** import string import GemRB from GUIDefines import * from GUICommonWindows import * from ie_stats import * from GUICommonWindows import SetSelectionChangeHandler - from GUICommon import CloseOtherWindow StoreWindow = None StoreShoppingWindow = None StoreIdentifyWindow = None --- 26,38 ---- import string import GemRB + import GUICommonWindows from GUIDefines import * from GUICommonWindows import * from ie_stats import * from GUICommonWindows import SetSelectionChangeHandler StoreWindow = None + ActionWindow = None + PortraitWindow = None StoreShoppingWindow = None StoreIdentifyWindow = None *************** *** 40,47 **** StoreRumourWindow = None StoreRentWindow = None ! OldPortrait = None ! OldAction = None ! OldMessage = None ! OldOptions = None RentIndex = -1 --- 42,46 ---- StoreRumourWindow = None StoreRentWindow = None ! OldPortraitWindow = None RentIndex = -1 *************** *** 74,82 **** store_update_funcs = None def OpenStoreWindow (): global Store ! global StoreWindow ! global store_update_funcs, inventory_slots ! global OldPortrait, OldMessage, OldAction, OldOptions #these are function pointers, not strings --- 73,104 ---- store_update_funcs = None + def CloseStoreWindow (): + global StoreWindow, ActionWindow, PortraitWindow + global OldPortraitWindow + + CloseStoreShoppingWindow () + CloseStoreIdentifyWindow () + CloseStoreStealWindow () + CloseStoreHealWindow () + CloseStoreDonateWindow () + CloseStoreRumourWindow () + CloseStoreRentWindow () + + GemRB.UnloadWindow (StoreWindow) + GemRB.UnloadWindow (ActionWindow) + GemRB.UnloadWindow (PortraitWindow) + StoreWindow = None + GemRB.LeaveStore () + GemRB.SetVisible (0,1) #enabling the game control screen + GemRB.UnhideGUI () #enabling the other windows + GUICommonWindows.PortraitWindow = OldPortraitWindow + SetSelectionChangeHandler( None ) + + def OpenStoreWindow (): global Store ! global StoreWindow, ActionWindow, PortraitWindow ! global OldPortraitWindow ! global store_update_funcs #these are function pointers, not strings *************** *** 87,132 **** OpenStoreRumourWindow,OpenStoreRentWindow ) - if CloseOtherWindow( OpenStoreWindow ): - GemRB.HideGUI () - CloseStoreShoppingWindow () - CloseStoreIdentifyWindow () - CloseStoreStealWindow () - CloseStoreHealWindow () - CloseStoreDonateWindow () - CloseStoreRumourWindow () - CloseStoreRentWindow () - - GemRB.UnloadWindow (StoreWindow) - StoreWindow = None - GemRB.SetVar ("OtherWindow", -1) - GemRB.SetVar ("TopWindow", -1) - GemRB.SetVar ("PortraitWindow", OldPortrait) - GemRB.SetVar ("OptionsWindow", OldOptions) - GemRB.SetVar ("ActionWindow", OldAction) - GemRB.SetVar ("MessageWindow", OldMessage) - SetSelectionChangeHandler( None ) - GemRB.SetVisible (0,1) #enabling the game control screen - GemRB.UnhideGUI () - GemRB.LeaveStore () - return - - OldPortrait = GemRB.GetVar ("PortraitWindow") - OldAction = GemRB.GetVar ("ActionWindow") - OldMessage = GemRB.GetVar ("MessageWindow") - OldOptions = GemRB.GetVar ("OptionsWindow") - GemRB.HideGUI () GemRB.SetVisible (0,0) #removing the game control screen GemRB.SetVar ("Action", 0) GemRB.LoadWindowPack ("GUISTORE", 640, 480) StoreWindow = Window = GemRB.LoadWindow (3) ! GemRB.SetWindowFrame (Window) ! GemRB.SetVar ("OtherWindow", StoreWindow) #this is the store button row ! OpenPortraitWindow(0) ActionWindow = GemRB.LoadWindow(0) ! GemRB.SetVar ("ActionWindow", ActionWindow) GemRB.SetWindowFrame (ActionWindow) - GemRB.SetVar ("MessageWindow", -1) - GemRB.SetVar ("OptionsWindow", -1) Store = GemRB.GetStore() --- 109,124 ---- OpenStoreRumourWindow,OpenStoreRentWindow ) GemRB.HideGUI () GemRB.SetVisible (0,0) #removing the game control screen + GemRB.SetVar ("Action", 0) GemRB.LoadWindowPack ("GUISTORE", 640, 480) StoreWindow = Window = GemRB.LoadWindow (3) ! #saving the original portrait window ! 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) Store = GemRB.GetStore() *************** *** 134,138 **** Button = GemRB.GetControl (Window, 0) GemRB.SetText (Window, Button, 11973) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenStoreWindow") #Store type icon --- 126,130 ---- Button = GemRB.GetControl (Window, 0) GemRB.SetText (Window, Button, 11973) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseStoreWindow") #Store type icon *************** *** 159,179 **** GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! GemRB.UnhideGUI () store_update_funcs[store_buttons[0]] () def OpenStoreShoppingWindow (): global StoreShoppingWindow - GemRB.HideGUI () if StoreShoppingWindow != None: Window = StoreShoppingWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreShoppingWindow () - GemRB.UnhideGUI () return StoreShoppingWindow = Window = GemRB.LoadWindow (2) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) # buy price ... --- 151,169 ---- GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! GemRB.SetVisible (ActionWindow, 1) ! GemRB.SetVisible (Window, 1) store_update_funcs[store_buttons[0]] () + GemRB.SetVisible (PortraitWindow, 1) + def OpenStoreShoppingWindow (): global StoreShoppingWindow if StoreShoppingWindow != None: Window = StoreShoppingWindow UpdateStoreShoppingWindow () return StoreShoppingWindow = Window = GemRB.LoadWindow (2) # buy price ... *************** *** 226,230 **** SetSelectionChangeHandler( UpdateStoreShoppingWindow ) UpdateStoreShoppingWindow () ! GemRB.UnhideGUI () --- 216,220 ---- SetSelectionChangeHandler( UpdateStoreShoppingWindow ) UpdateStoreShoppingWindow () ! GemRB.SetVisible(Window, 1) *************** *** 232,248 **** global StoreIdentifyWindow - GemRB.HideGUI () GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) if StoreIdentifyWindow != None: Window = StoreIdentifyWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreIdentifyWindow () - GemRB.UnhideGUI () return StoreIdentifyWindow = Window = GemRB.LoadWindow (4) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) # Identify --- 222,233 ---- *************** *** 270,274 **** SetSelectionChangeHandler( UpdateStoreIdentifyWindow ) UpdateStoreIdentifyWindow () ! GemRB.UnhideGUI () --- 255,259 ---- SetSelectionChangeHandler( UpdateStoreIdentifyWindow ) UpdateStoreIdentifyWindow () ! GemRB.SetVisible(Window, 1) *************** *** 276,290 **** global StoreStealWindow - GemRB.HideGUI () if StoreStealWindow != None: Window = StoreStealWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreStealWindow () - GemRB.UnhideGUI () return StoreStealWindow = Window = GemRB.LoadWindow (6) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) j = 1 --- 261,270 ---- *************** *** 322,326 **** SetSelectionChangeHandler( UpdateStoreStealWindow ) UpdateStoreStealWindow () ! GemRB.UnhideGUI () --- 302,306 ---- SetSelectionChangeHandler( UpdateStoreStealWindow ) UpdateStoreStealWindow () ! GemRB.SetVisible(Window, 1) *************** *** 328,342 **** global StoreDonateWindow - GemRB.HideGUI () if StoreDonateWindow != None: Window = StoreDonateWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreDonateWindow () - GemRB.UnhideGUI () return StoreDonateWindow = Window = GemRB.LoadWindow (9) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) # graphics --- 308,317 ---- *************** *** 366,370 **** SetSelectionChangeHandler( UpdateStoreDonateWindow ) UpdateStoreDonateWindow () ! GemRB.UnhideGUI () --- 341,345 ---- SetSelectionChangeHandler( UpdateStoreDonateWindow ) UpdateStoreDonateWindow () ! GemRB.SetVisible(Window, 1) *************** *** 372,388 **** global StoreHealWindow - GemRB.HideGUI () GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) if StoreHealWindow != None: Window = StoreHealWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreHealWindow () - GemRB.UnhideGUI () return StoreHealWindow = Window = GemRB.LoadWindow (5) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) #spell buttons --- 347,358 ---- *************** *** 413,417 **** UpdateStoreHealWindow () ! GemRB.UnhideGUI () --- 383,387 ---- UpdateStoreHealWindow () ! GemRB.SetVisible(Window, 1) *************** *** 419,434 **** global StoreRumourWindow - GemRB.HideGUI () GemRB.SetVar ("TopIndex", 0) if StoreRumourWindow != None: Window = StoreRumourWindow - GemRB.SetVar ("TopWindow", Window) UpdateStoreRumourWindow () - GemRB.UnhideGUI () return StoreRumourWindow = Window = GemRB.LoadWindow (8) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) #removing those pesky labels --- 389,399 ---- *************** *** 453,457 **** UpdateStoreRumourWindow () ! GemRB.UnhideGUI () --- 418,422 ---- UpdateStoreRumourWindow () ! GemRB.SetVisible(Window, 1) *************** *** 459,474 **** global StoreRentWindow, RentIndex - GemRB.HideGUI () if StoreRentWindow != None: Window = StoreRentWindow GemRB.SetVar ("RentIndex", RentIndex) - GemRB.SetVar ("TopWindow", Window) UpdateStoreRentWindow () - GemRB.UnhideGUI () return StoreRentWindow = Window = GemRB.LoadWindow (7) - GemRB.SetWindowFrame (Window) - GemRB.SetVar ("TopWindow", Window) # room types --- 424,434 ---- *************** *** 501,505 **** UpdateStoreRentWindow () ! GemRB.UnhideGUI () --- 461,465 ---- UpdateStoreRentWindow () ! GemRB.SetVisible(Window, 1) *************** *** 696,702 **** GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") - GemRB.HideGUI () - GemRB.SetVar ("FloatWindow", Window) - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) --- 656,659 ---- *************** *** 841,847 **** #if reputation<180: if GemRB.IncreaseReputation( donation ): - #limit = donationlimit[reputation/10] - #if donation>=limit: - #GemRB.GameSetReputation (reputation+10) GemRB.TextAreaAppend (Window, TextArea, 10468, -1) GemRB.PlaySound ("act_03") --- 798,801 ---- *************** *** 913,919 **** GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") - GemRB.HideGUI () - GemRB.SetVar ("FloatWindow", Window) - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) --- 867,870 ---- *************** *** 968,972 **** Drink = GemRB.GetStoreDrink (Index) if gold < Drink['Price']: - #GemRB.TextAreaAppend (Window, TextArea, 11049, -1) ErrorWindow (11049) return --- 919,922 ---- *************** *** 1003,1008 **** if Gold<price: ErrorWindow (11051) - #GemRB.SetText (Window, TextArea, 11051) return GemRB.GameSetPartyGold (Gold-price) UpdateStoreRentWindow () --- 953,958 ---- if Gold<price: ErrorWindow (11051) return + GemRB.GameSetPartyGold (Gold-price) UpdateStoreRentWindow () *************** *** 1076,1082 **** GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") - GemRB.HideGUI () - GemRB.SetVar ("FloatWindow", Window) - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) --- 1026,1029 ---- *************** *** 1084,1091 **** def ErrorDone (): Window = GemRB.GetVar ("FloatWindow") - GemRB.HideGUI () GemRB.UnloadWindow (Window) - GemRB.SetVar ("FloatWindow", -1) - GemRB.UnhideGUI () --- 1031,1035 ---- |