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

[<lyn...@us...>]

Revision: 7145
          http://gemrb.svn.sourceforge.net/gemrb/?rev=7145&view=rev
Author:   lynxlupodian
Date:     2009-09-13 20:35:40 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
more code share, less quick action bugs

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/GUICommon.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py

Modified: gemrb/trunk/gemrb/GUIScripts/GUICommon.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/GUICommon.py	2009-09-13 20:25:46 UTC (rev 7144)
+++ gemrb/trunk/gemrb/GUIScripts/GUICommon.py	2009-09-13 20:35:40 UTC (rev 7145)
@@ -58,6 +58,27 @@
 	GemRB.GameSetFormation (GemRB.GetVar ("Formation"))
 	return
 
+def ActionStopPressed ():
+	for i in range (PARTY_SIZE):
+		if GemRB.GameIsPCSelected (i + 1):
+			GemRB.ClearActions (i + 1)
+	return
+
+def OpenFloatMenuWindow ():
+	GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
+
+def ActionTalkPressed ():
+	GemRB.GameControlSetTargetMode (TARGET_MODE_TALK,GA_NO_DEAD|GA_NO_ENEMY|GA_NO_HIDDEN)
+
+def ActionAttackPressed ():
+	GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK,GA_NO_DEAD|GA_NO_SELF|GA_NO_HIDDEN)
+
+def ActionDefendPressed ():
+	GemRB.GameControlSetTargetMode (TARGET_MODE_DEFEND,GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
+
+def ActionThievingPressed ():
+	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK, GA_NO_DEAD|GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
+
 def GetMageSpells (Kit, Alignment, Level):
 	MageSpells = []
 	SpellType = 99

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2009-09-13 20:25:46 UTC (rev 7144)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2009-09-13 20:35:40 UTC (rev 7145)
@@ -284,21 +284,6 @@
 		ActionsWindow.SetupSpellIcons(pc, 4, TopIndex)
 	return
 
-def OpenFloatMenuWindow ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
-
-def ActionTalkPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_TALK)
-
-def ActionAttackPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK)
-
-def ActionDefendPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_DEFEND)
-
-def ActionThievingPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK)
-
 def ActionQWeaponPressed (which):
 	pc = GemRB.GameGetFirstSelectedPC ()
 
@@ -324,12 +309,6 @@
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed(3)
 
-def ActionStopPressed ():
-	for i in range (PARTY_SIZE):
-		if GemRB.GameIsPCSelected(i + 1):
-			GemRB.ClearActions(i + 1)
-	return
-
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	TopIndex = GemRB.GetVar ("TopIndex")

Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2009-09-13 20:25:46 UTC (rev 7144)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2009-09-13 20:35:40 UTC (rev 7145)
@@ -302,21 +302,6 @@
 		ActionsWindow.SetupSpellIcons(pc, 4, TopIndex)
 	return
 
-def OpenFloatMenuWindow ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
-
-def ActionTalkPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_TALK,GA_NO_DEAD|GA_NO_ENEMY|GA_NO_HIDDEN)
-
-def ActionAttackPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK,GA_NO_DEAD|GA_NO_SELF|GA_NO_HIDDEN)
-
-def ActionDefendPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_DEFEND,GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
-
-def ActionThievingPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK, GA_NO_DEAD|GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
-
 def ActionQWeaponPressed (which):
 	"""Selects the given quickslot weapon if possible."""
 
@@ -346,14 +331,6 @@
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed(3)
 
-def ActionStopPressed ():
-	"""Clears all party actions."""
-
-	for i in range (PARTY_SIZE):
-		if GemRB.GameIsPCSelected(i + 1):
-			GemRB.ClearActions(i + 1)
-	return
-
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	"""Scrolls the actions window left.

Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py	2009-09-13 20:25:46 UTC (rev 7144)
+++ gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py	2009-09-13 20:35:40 UTC (rev 7145)
@@ -267,21 +267,6 @@
 		ActionsWindow.SetupSpellIcons(pc, 4, TopIndex)
 	return
 
-def OpenFloatMenuWindow ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
-
-def ActionTalkPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_TALK)
-
-def ActionAttackPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK)
-
-def ActionDefendPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_DEFEND)
-
-def ActionThievingPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK)
-
 def ActionQWeaponPressed (which):
 	pc = GemRB.GameGetFirstSelectedPC ()
 
@@ -307,12 +292,6 @@
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed(3)
 
-def ActionStopPressed ():
-	for i in range (PARTY_SIZE):
-		if GemRB.GameIsPCSelected(i + 1):
-			GemRB.ClearActions(i + 1)
-	return
-
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	TopIndex = GemRB.GetVar ("TopIndex")

Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py	2009-09-13 20:25:46 UTC (rev 7144)
+++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py	2009-09-13 20:35:40 UTC (rev 7145)
@@ -214,21 +214,6 @@
 		PortraitWindow.SetupSpellIcons (pc, 4, TopIndex, 6)
 	return
 
-def OpenFloatMenuWindow ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_NONE )
-
-def ActionTalkPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_TALK)
-
-def ActionAttackPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK)
-
-def ActionDefendPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_DEFEND)
-
-def ActionThievingPressed ():
-	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK)
-
 def ActionQWeaponPressed (which):
 	global PortraitWindow
 
@@ -256,12 +241,6 @@
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed (3)
 
-def ActionStopPressed ():
-	for i in range (PARTY_SIZE):
-		if GemRB.GameIsPCSelected (i + 1):
-			GemRB.ClearActions (i + 1)
-	return
-
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	TopIndex = GemRB.GetVar ("TopIndex")


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