[Gemrb-commits] gemrb: branch master updated. 4c5dd7b45c46923350a010b3c50b91516c009074

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  4c5dd7b45c46923350a010b3c50b91516c009074 (commit)

Summary of changes:
 gemrb/core/Actions.cpp |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
      from  d862ff785c12a1e52668da00d12a803625f1e5b3 (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=4c5dd7b45c46923350a010b3c50b91516c009074

commit 4c5dd7b45c46923350a010b3c50b91516c009074
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat May 8 18:44:17 2010 +0200

    GameScript::Turn: added a few more checks and feedback

diff --git a/gemrb/core/Actions.cpp b/gemrb/core/Actions.cpp
index 37c06bd..7421a40 100644
--- a/gemrb/core/Actions.cpp
+++ b/gemrb/core/Actions.cpp
@@ -5425,7 +5425,17 @@ void GameScript::Turn(Scriptable* Sender, Action* /*parameters*/)
 		return;
 	}
 	Actor *actor = (Actor *) Sender;
-	actor->SetModal( MS_TURNUNDEAD);
+
+	if (actor->Modified[IE_DISABLEDBUTTON] & (1<<ACT_TURN)) {
+		return;
+	}
+
+	int skill = actor->GetStat(IE_TURNUNDEADLEVEL);
+	if (skill < 1) return;
+
+	actor->SetModal(MS_TURNUNDEAD);
+	core->DisplayConstantStringName(STR_TURNING_ON, 0xffffff, actor);
+
 }
 
 void GameScript::TurnAMT(Scriptable* Sender, Action* parameters)

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


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