[Gemrb-commits] gemrb: branch master updated. v0.7.2-325-ga0e923b

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a0e923b9436fc2075d490bfb35d70bfa94bbf4e1 (commit)

Summary of changes:
 gemrb/core/GameScript/Actions.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
      from  815907861f4dd024780bd049d46a455abef1752f (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=a0e923b9436fc2075d490bfb35d70bfa94bbf4e1

commit a0e923b9436fc2075d490bfb35d70bfa94bbf4e1
Author: Brad Allred <bra...@me...>
Date:   Tue Jan 8 11:26:55 2013 -0700

    Actions: time is a dword

diff --git a/gemrb/core/GameScript/Actions.cpp b/gemrb/core/GameScript/Actions.cpp
index 4edb524..1bd16ac 100644
--- a/gemrb/core/GameScript/Actions.cpp
+++ b/gemrb/core/GameScript/Actions.cpp
@@ -1718,9 +1718,9 @@ void GameScript::DisplayString(Scriptable* Sender, Action* parameters)
 //DisplayStringHead, but wait until done
 void GameScript::DisplayStringWait(Scriptable* Sender, Action* parameters)
 {
-	ieWord gt = core->GetGame()->GameTime;
+	ieDword gt = core->GetGame()->GameTime;
 	if (Sender->CurrentActionState) {
-		if (gt >= parameters->int2Parameter) {
+		if (gt >= (ieDword)parameters->int2Parameter) {
 			Sender->ReleaseCurrentAction();
 		}
 		return;

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


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