[Gemrb-commits] gemrb: branch master updated. v0.6.2-1396-g3f20058

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3f200583257bb881ff2a2a4dc1d938acd82cc1f8 (commit)

Summary of changes:
 gemrb/core/Scriptable/Scriptable.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
      from  b412c0a5babe1d6bf0292b7bc200f731e74cd23a (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=3f200583257bb881ff2a2a4dc1d938acd82cc1f8

commit 3f200583257bb881ff2a2a4dc1d938acd82cc1f8
Author: Avenger <ave...@so...>
Date:   Tue Jul 19 21:05:20 2011 +0200

    unnecessary, but not intrusive debug code to help catch offending actions

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
index 579de2a..87decb7 100644
--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -508,9 +508,14 @@ void Scriptable::ProcessActions()
 		if (WaitCounter) return;
 	}
 
+	int lastAction = -1;
+
 	while (true) {
 		CurrentActionInterruptable = true;
 		if (!CurrentAction) {
+			if (! (CurrentActionTicks == 0 && CurrentActionState == 0)) {
+				print("Last action: %d\n", lastAction);
+			}
 			assert(CurrentActionTicks == 0 && CurrentActionState == 0);
 			CurrentAction = PopNextAction();
 		} else {
@@ -518,8 +523,10 @@ void Scriptable::ProcessActions()
 		}
 		if (!CurrentAction) {
 			ClearActions();
+			lastAction = -1;
 			break;
 		}
+		lastAction = CurrentAction->actionID;
 		GameScript::ExecuteAction( this, CurrentAction );
 		//break execution in case of a Wait flag
 		if (WaitCounter) {

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


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