[Scummvm-cvs-logs] SF.net SVN: scummvm: [31178] scummvm/trunk/engines/kyra/kyra_v2.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Mar 18 14:01:33 CET 2008


Revision: 31178
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31178&view=rev
Author:   lordhoto
Date:     2008-03-18 06:01:33 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Completed implementation of KyraEngine_v2::inputSceneChange.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-18 12:55:41 UTC (rev 31177)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-18 13:01:33 UTC (rev 31178)
@@ -1375,7 +1375,25 @@
 	if (wayLength != 0 && wayLength != 0x7D00)
 		refreshNPC = (trySceneChange(_movFacingTable, unk1, unk2) != 0);
 
-	//XXX
+	int charLayer = _screen->getLayer(_mainCharacter.x1, _mainCharacter.y1);
+	if (_layerFlagTable[charLayer] != 0 && !queryGameFlag(0x163)) {
+		if (queryGameFlag(0x164)) {
+			//_screen->hideMouse();
+			_timer->disable(5);
+			runTemporaryScript("_ZANBURN.EMC", 0, 1, 1, 0);
+			_deathHandler = 7;
+			snd_playWanderScoreViaMap(0x53, 1);
+		} else {
+			objectChat(getTableString(0xFD, _cCodeBuffer, 1), 0, 0x83, 0xFD);
+			setGameFlag(0x164);
+			_timer->enable(5);
+			_timer->setCountdown(5, 120);
+		}
+	} else if (queryGameFlag(0x164)) {
+		objectChat(getTableString(0xFE, _cCodeBuffer, 1), 0, 0x83, 0xFE);
+		resetGameFlag(0x164);
+		_timer->disable(5);
+	}
 
 	if (refreshNPC)
 		enterNewSceneUnk2(0);


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




More information about the Scummvm-git-logs mailing list