From: Jarda B. <edh...@us...> - 2005-07-30 11:45:28
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8260/gemrb/GUIScripts/pst Modified Files: FloatMenuWindow.py GUICommonWindows.py Log Message: Preliminary support for targetting in GameControl, not yet functional Trivial CastSpell function Cheat code ^C to cast a spell Fix for WINDOW_BOUNDED in SetWindowSize() Centering on Actor, not really working Index: FloatMenuWindow.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst/FloatMenuWindow.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FloatMenuWindow.py 25 Jul 2005 14:21:32 -0000 1.11 --- FloatMenuWindow.py 30 Jul 2005 11:45:11 -0000 1.12 *************** *** 82,86 **** # Initiate Dialogue Button = GemRB.GetControl (Window, 1) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "FloatMenuForceDialog") GemRB.SetTooltip (Window, Button, 8191) --- 82,86 ---- # Initiate Dialogue Button = GemRB.GetControl (Window, 1) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectDialog") GemRB.SetTooltip (Window, Button, 8191) *************** *** 357,360 **** --- 357,364 ---- + def FloatMenuSelectDialog (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_TALK) + UpdateFloatMenuWindow () + def FloatMenuSelectWeapons (): global float_menu_mode, float_menu_index *************** *** 362,365 **** --- 366,370 ---- float_menu_index = 0 # FIXME: Force attack mode + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) UpdateFloatMenuWindow () *************** *** 374,377 **** --- 379,383 ---- float_menu_mode = MENU_MODE_SPELLS float_menu_index = 0 + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_CAST) UpdateFloatMenuWindow () Index: GUICommonWindows.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst/GUICommonWindows.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** GUICommonWindows.py 4 Jul 2005 20:40:21 -0000 1.34 --- GUICommonWindows.py 30 Jul 2005 11:45:19 -0000 1.35 *************** *** 146,156 **** #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenFloatMenuWindow") ! # Can't Reach ??? Button = GemRB.GetControl (Window, 0) GemRB.SetTooltip (Window, Button, 41647) # or 41648 Unlock ... ! #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenFormationWindow") ! #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPartyManageWindow") ! #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenContainerWindow") ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CntReachPress") # Message popup --- 146,153 ---- #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenFloatMenuWindow") ! # (Un)Lock view on character Button = GemRB.GetControl (Window, 0) GemRB.SetTooltip (Window, Button, 41647) # or 41648 Unlock ... ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnLockViewPress") # Message popup *************** *** 159,164 **** ! def CntReachPress (): ! print "CntReachPress" def AIPress (): --- 156,162 ---- ! def OnLockViewPress (): ! GemRB.GameControlSetScreenFlags (SF_CENTERONACTOR | SF_ALWAYSCENTER, OP_OR) ! print "OnLockViewPress" def AIPress (): |