[Scummvm-cvs-logs] SF.net SVN: scummvm:[55649] scummvm/trunk/engines/toon

[sylvaintv at users.sourceforge.net]

Revision: 55649
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55649&view=rev
Author:   sylvaintv
Date:     2011-01-30 00:44:51 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
TOON: More Drew visibility fixes

In the castle, Drew disappeared if you clicked twice on the closed door.

Modified Paths:
--------------
    scummvm/trunk/engines/toon/character.cpp
    scummvm/trunk/engines/toon/script_func.cpp

Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp	2011-01-30 00:04:04 UTC (rev 55648)
+++ scummvm/trunk/engines/toon/character.cpp	2011-01-30 00:44:51 UTC (rev 55649)
@@ -91,6 +91,11 @@
 	if (facing == _facing)
 		return;
 
+	if (!_visible) {
+		_facing = facing;
+		return;
+	}
+
 	if (_blockingWalk) {
 		_flags |= 2;
 
@@ -340,7 +345,7 @@
 	_animFlags = 0;
 	_flags &= ~1;
 	_flags &= ~4;
-	
+
 	if (needStandingAnim) {
 		playStandingAnim();
 	}

Modified: scummvm/trunk/engines/toon/script_func.cpp
===================================================================
--- scummvm/trunk/engines/toon/script_func.cpp	2011-01-30 00:04:04 UTC (rev 55648)
+++ scummvm/trunk/engines/toon/script_func.cpp	2011-01-30 00:44:51 UTC (rev 55649)
@@ -453,7 +453,6 @@
 }
 
 int32 ScriptFunc::sys_Cmd_Init_Conversation_AP(EMCState *state) {
-	debugC(0, 0xfff, "init_conversation_ap %d %d %d %d", stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_vm->initCharacter(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	return 0;
 }
@@ -464,7 +463,13 @@
 }
 
 int32 ScriptFunc::sys_Cmd_Say_Lines(EMCState *state) {
-	//_vm->sayLines(2, 1440);
+	
+	// WORKAROUND: In the scene 4 (Castle), if you click twice on the closed door, Drew disappears
+	//				the script makes him disappear for the custom animation and not reappear.
+	if (_vm->state()->_currentScene == 4 && stackPos(1) == 562) {
+		_vm->getDrew()->setVisible(true);
+	}
+
 	_vm->sayLines(stackPos(0), stackPos(1));
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.