[Gemrb-commits] gemrb: branch master updated. d862ff785c12a1e52668da00d12a803625f1e5b3

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  d862ff785c12a1e52668da00d12a803625f1e5b3 (commit)

Summary of changes:
 gemrb/GUIScripts/GUICommon.py             |   27 +++++++++++++++++++++++++++
 gemrb/GUIScripts/bg1/GUICommonWindows.py  |   26 --------------------------
 gemrb/GUIScripts/bg2/GUICommonWindows.py  |   27 ---------------------------
 gemrb/GUIScripts/iwd/GUICommonWindows.py  |   26 --------------------------
 gemrb/GUIScripts/iwd2/GUICommonWindows.py |   26 --------------------------
 5 files changed, 27 insertions(+), 105 deletions(-)
      from  f064d9009880625b72510ab46e6c27d45fcb6363 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=d862ff785c12a1e52668da00d12a803625f1e5b3

commit d862ff785c12a1e52668da00d12a803625f1e5b3
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat May 8 13:49:02 2010 +0200

    moved all the ActionQItem*Pressed() duplicates into GUICommon

diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py
index 6ab3e3f..66cab62 100644
--- a/gemrb/GUIScripts/GUICommon.py
+++ b/gemrb/GUIScripts/GUICommon.py
@@ -110,6 +110,33 @@ def ActionDefendPressed ():
 def ActionThievingPressed ():
 	GemRB.GameControlSetTargetMode (TARGET_MODE_PICK, GA_NO_DEAD|GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
 
+def ActionQItemPressed (action):
+	"""Uses the given quick item."""
+	pc = GemRB.GameGetFirstSelectedPC ()
+	# quick slot
+	GemRB.UseItem (pc, -2, action)
+	return
+
+def ActionQItem1Pressed ():
+	ActionQItemPressed (ACT_QSLOT1)
+	return
+
+def ActionQItem2Pressed ():
+	ActionQItemPressed (ACT_QSLOT2)
+	return
+
+def ActionQItem3Pressed ():
+	ActionQItemPressed (ACT_QSLOT3)
+	return
+
+def ActionQItem4Pressed ():
+	ActionQItemPressed (ACT_QSLOT4)
+	return
+
+def ActionQItem5Pressed ():
+	ActionQItemPressed (ACT_QSLOT5)
+	return
+
 def GetActorPaperDoll (actor):
 	anim_id = GemRB.GetPlayerStat (actor, IE_ANIMATION_ID)
 	level = GemRB.GetPlayerStat (actor, IE_ARMOR_TYPE)
diff --git a/gemrb/GUIScripts/bg1/GUICommonWindows.py b/gemrb/GUIScripts/bg1/GUICommonWindows.py
index fecd928..37f4833 100644
--- a/gemrb/GUIScripts/bg1/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg1/GUICommonWindows.py
@@ -373,32 +373,6 @@ def ActionCastPressed ():
 	UpdateActionsWindow ()
 	return
 
-def ActionQItemPressed (action):
-	pc = GemRB.GameGetFirstSelectedPC ()
-	#quick slot
-	GemRB.UseItem (pc, -2, action)
-	return
-	
-def ActionQItem1Pressed ():
-	ActionQItemPressed (ACT_QSLOT1)
-	return
-
-def ActionQItem2Pressed ():
-	ActionQItemPressed (ACT_QSLOT2)
-	return
-
-def ActionQItem3Pressed ():
-	ActionQItemPressed (ACT_QSLOT3)
-	return
-
-def ActionQItem4Pressed ():
-	ActionQItemPressed (ACT_QSLOT4)
-	return
-
-def ActionQItem5Pressed ():
-	ActionQItemPressed (ACT_QSLOT5)
-	return
-
 def ActionInnatePressed ():
 	GemRB.SetVar ("TopIndex", 0)
 	GemRB.SetVar ("ActionLevel", 3)
diff --git a/gemrb/GUIScripts/bg2/GUICommonWindows.py b/gemrb/GUIScripts/bg2/GUICommonWindows.py
index 2659fc3..a42f2db 100644
--- a/gemrb/GUIScripts/bg2/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg2/GUICommonWindows.py
@@ -408,33 +408,6 @@ def ActionCastPressed ():
 	UpdateActionsWindow ()
 	return
 
-def ActionQItemPressed (action):
-	"""Uses the given quick item."""
-	pc = GemRB.GameGetFirstSelectedPC ()
-	#quick slot
-	GemRB.UseItem (pc, -2, action)
-	return
-
-def ActionQItem1Pressed ():
-	ActionQItemPressed (ACT_QSLOT1)
-	return
-
-def ActionQItem2Pressed ():
-	ActionQItemPressed (ACT_QSLOT2)
-	return
-
-def ActionQItem3Pressed ():
-	ActionQItemPressed (ACT_QSLOT3)
-	return
-
-def ActionQItem4Pressed ():
-	ActionQItemPressed (ACT_QSLOT4)
-	return
-
-def ActionQItem5Pressed ():
-	ActionQItemPressed (ACT_QSLOT5)
-	return
-
 def ActionInnatePressed ():
 	"""Opens the innate spell scrollbar."""
 	GemRB.SetVar ("TopIndex", 0)
diff --git a/gemrb/GUIScripts/iwd/GUICommonWindows.py b/gemrb/GUIScripts/iwd/GUICommonWindows.py
index 811a7e4..17705aa 100644
--- a/gemrb/GUIScripts/iwd/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd/GUICommonWindows.py
@@ -356,32 +356,6 @@ def ActionCastPressed ():
 	UpdateActionsWindow ()
 	return
 
-def ActionQItemPressed (action):
-	pc = GemRB.GameGetFirstSelectedPC ()
-	#quick slot
-	GemRB.UseItem (pc, -2, action)
-	return
-
-def ActionQItem1Pressed ():
-	ActionQItemPressed (ACT_QSLOT1)
-	return
-
-def ActionQItem2Pressed ():
-	ActionQItemPressed (ACT_QSLOT2)
-	return
-
-def ActionQItem3Pressed ():
-	ActionQItemPressed (ACT_QSLOT3)
-	return
-
-def ActionQItem4Pressed ():
-	ActionQItemPressed (ACT_QSLOT4)
-	return
-
-def ActionQItem5Pressed ():
-	ActionQItemPressed (ACT_QSLOT5)
-	return
-
 def ActionInnatePressed ():
 	GemRB.SetVar ("TopIndex", 0)
 	GemRB.SetVar ("ActionLevel", 3)
diff --git a/gemrb/GUIScripts/iwd2/GUICommonWindows.py b/gemrb/GUIScripts/iwd2/GUICommonWindows.py
index 06f0c78..b9592e6 100644
--- a/gemrb/GUIScripts/iwd2/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd2/GUICommonWindows.py
@@ -304,32 +304,6 @@ def ActionCastPressed ():
 	UpdateActionsWindow ()
 	return
 
-def ActionQItemPressed (action):
-	pc = GemRB.GameGetFirstSelectedPC ()
-	#quick slot
-	GemRB.UseItem (pc, -2, action)
-	return
-
-def ActionQItem1Pressed ():
-	ActionQItemPressed (ACT_QSLOT1)
-	return
-
-def ActionQItem2Pressed ():
-	ActionQItemPressed (ACT_QSLOT2)
-	return
-
-def ActionQItem3Pressed ():
-	ActionQItemPressed (ACT_QSLOT3)
-	return
-
-def ActionQItem4Pressed ():
-	ActionQItemPressed (ACT_QSLOT4)
-	return
-
-def ActionQItem5Pressed ():
-	ActionQItemPressed (ACT_QSLOT5)
-	return
-
 def ActionInnatePressed ():
 	GemRB.SetVar ("TopIndex", 0)
 	GemRB.SetVar ("ActionLevel", 3)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator