[Gemrb-commits] gemrb: branch master updated. v0.7.2-35-g353829c

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  353829c5ef73e5d83e8d746feeac0361a345d61c (commit)
       via  38e7d06d9fdf6de9677d62d799142460dd6dcbda (commit)

Summary of changes:
 gemrb/GUIScripts/GUIOPT.py      |   14 +++++++-------
 gemrb/core/Scriptable/Actor.cpp |    4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)
      from  80f84ddc993c58fa43159029d90adcf9119e7a2f (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=353829c5ef73e5d83e8d746feeac0361a345d61c

commit 353829c5ef73e5d83e8d746feeac0361a345d61c
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Dec 4 14:59:42 2012 +0100

    also trigger AP_UNUSABLE in the pure weapon path

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 866d63f..0ec1023 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -7466,6 +7466,10 @@ void Actor::ModifyWeaponDamage(WeaponInfo &wi, Actor *target, int &damage, bool
 		//'my weapon has no effect'
 		damage = 0;
 		critical = false;
+		if (InParty) {
+			VerbalConstant(VB_TIMMUNE, 1);
+			core->Autopause(AP_UNUSABLE, this);
+		}
 		return;
 	}
 

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=38e7d06d9fdf6de9677d62d799142460dd6dcbda

commit 38e7d06d9fdf6de9677d62d799142460dd6dcbda
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Dec 4 14:59:11 2012 +0100

    guiopt: fixed wrong descriptions and mapped values for some autopause states

diff --git a/gemrb/GUIScripts/GUIOPT.py b/gemrb/GUIScripts/GUIOPT.py
index 0b9bf4a..d41c043 100644
--- a/gemrb/GUIScripts/GUIOPT.py
+++ b/gemrb/GUIScripts/GUIOPT.py
@@ -447,11 +447,11 @@ def OpenAutopauseOptionsWindow ():
 	GUIOPTControls.OptCancel (CloseAutopauseOptionsWindow, Window, 14)
 
 	# checkboxes OR the values if they associate to the same variable
-	GUIOPTControls.OptCheckbox (18044, 18032, HelpTextArea2, Window, 1, 17, 17159, 'Auto Pause State', None, 1) # weapon unusable
-	GUIOPTControls.OptCheckbox (18044, 18033, HelpTextArea2, Window, 2, 18, 17158, 'Auto Pause State', None, 2) # attacked
-	GUIOPTControls.OptCheckbox (18044, 18034, HelpTextArea2, Window, 3, 19, 17155, 'Auto Pause State', None, 4) # hit
-	GUIOPTControls.OptCheckbox (18044, 18035, HelpTextArea2, Window, 4, 20, 17156, 'Auto Pause State', None, 8) # wounded
-	GUIOPTControls.OptCheckbox (18044, 18036, HelpTextArea2, Window, 5, 21, 17157, 'Auto Pause State', None, 16) # dead
+	GUIOPTControls.OptCheckbox (18044, 18032, HelpTextArea2, Window, 1, 17, 17155, 'Auto Pause State', None, 4) # hit
+	GUIOPTControls.OptCheckbox (18044, 18033, HelpTextArea2, Window, 2, 18, 17156, 'Auto Pause State', None, 8) # wounded
+	GUIOPTControls.OptCheckbox (18044, 18034, HelpTextArea2, Window, 3, 19, 17157, 'Auto Pause State', None, 16) # dead
+	GUIOPTControls.OptCheckbox (18044, 18035, HelpTextArea2, Window, 4, 20, 17158, 'Auto Pause State', None, 2) # attacked
+	GUIOPTControls.OptCheckbox (18044, 18036, HelpTextArea2, Window, 5, 21, 17159, 'Auto Pause State', None, 1) # weapon unusable
 	GUIOPTControls.OptCheckbox (18044, 18037, HelpTextArea2, Window, 13, 22, 17160, 'Auto Pause State', None, 32) # target gone
 	GUIOPTControls.OptCheckbox (18044, 10640, HelpTextArea2, Window, 25, 24, 10639, 'Auto Pause State', None, 64) # end of round
 	if GUICommon.GameIsIWD2():
@@ -462,8 +462,8 @@ def OpenAutopauseOptionsWindow ():
 	elif not GUICommon.GameIsIWD1():
 		GUIOPTControls.OptCheckbox (18044, 23514, HelpTextArea2, Window, 26, 27, 23516, 'Auto Pause State', None, 128) # enemy sighted
 	if GUICommon.GameIsBG2():
-		GUIOPTControls.OptCheckbox (18044, 31872, HelpTextArea2, Window, 31, 33, 57354, 'Auto Pause State', None, 256) # trap found
-		GUIOPTControls.OptCheckbox (18044, 58171, HelpTextArea2, Window, 34, 30, 31875, 'Auto Pause State', None, 512) # spell cast
+		GUIOPTControls.OptCheckbox (18044, 58171, HelpTextArea2, Window, 31, 30, 31875, 'Auto Pause State', None, 512) # spell cast
+		GUIOPTControls.OptCheckbox (18044, 31872, HelpTextArea2, Window, 34, 33, 57354, 'Auto Pause State', None, 256) # trap found
 		GUIOPTControls.OptCheckbox (18044, 10571, HelpTextArea2, Window, 37, 36, 10574, 'Auto Pause Center', None, 1)
 
 	SubSubOptionsWindow = Window

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


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