[Gemrb-commits] gemrb: branch master updated. v0.6.2-1278-g9f689ef

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  9f689efa4ee4716b2bd2d54d96e7ef5f05746eea (commit)

Summary of changes:
 gemrb/GUIScripts/bg1/GUICommonWindows.py |   16 ++++++++++++++++
 gemrb/GUIScripts/iwd/GUICommonWindows.py |   16 ++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)
      from  b377fd3c798a54d12270a43f4da601ef2def307a (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=9f689efa4ee4716b2bd2d54d96e7ef5f05746eea

commit 9f689efa4ee4716b2bd2d54d96e7ef5f05746eea
Author: Avenger <ave...@so...>
Date:   Wed Jun 8 18:53:46 2011 +0200

    quickspells in bg1/iwd

diff --git a/gemrb/GUIScripts/bg1/GUICommonWindows.py b/gemrb/GUIScripts/bg1/GUICommonWindows.py
index 8475bff..ae758f0 100644
--- a/gemrb/GUIScripts/bg1/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg1/GUICommonWindows.py
@@ -354,6 +354,22 @@ def ActionQWeapon3Pressed ():
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed(3)
 
+def ActionQSpellPressed (which):
+	pc = GemRB.GameGetFirstSelectedActor ()
+
+	GemRB.SpellCast (pc, -2, which, 1)
+	UpdateActionsWindow ()
+	return
+
+def ActionQSpell1Pressed ():
+	ActionQSpellPressed(0)
+
+def ActionQSpell2Pressed ():
+	ActionQSpellPressed(1)
+
+def ActionQSpell3Pressed ():
+	ActionQSpellPressed(2)
+
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	"""Scrolls the actions window left.
diff --git a/gemrb/GUIScripts/iwd/GUICommonWindows.py b/gemrb/GUIScripts/iwd/GUICommonWindows.py
index 0cb7e0f..c644058 100644
--- a/gemrb/GUIScripts/iwd/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd/GUICommonWindows.py
@@ -343,6 +343,22 @@ def ActionQWeapon3Pressed ():
 def ActionQWeapon4Pressed ():
 	ActionQWeaponPressed(3)
 
+def ActionQSpellPressed (which):
+	pc = GemRB.GameGetFirstSelectedActor ()
+
+	GemRB.SpellCast (pc, -2, which, 1)
+	UpdateActionsWindow ()
+	return
+
+def ActionQSpell1Pressed ():
+	ActionQSpellPressed(0)
+
+def ActionQSpell2Pressed ():
+	ActionQSpellPressed(1)
+
+def ActionQSpell3Pressed ():
+	ActionQSpellPressed(2)
+
 #no check needed because the button wouldn't be drawn if illegal
 def ActionLeftPressed ():
 	"""Scrolls the actions window left.

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


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