[Scummvm-cvs-logs] SF.net SVN: scummvm:[55440] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 55440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55440&view=rev
Author:   fuzzie
Date:     2011-01-22 17:33:44 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
MOHAWK: Add/use visit count for scenes.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/cstime.cpp
    scummvm/trunk/engines/mohawk/cstime_game.cpp
    scummvm/trunk/engines/mohawk/cstime_game.h

Modified: scummvm/trunk/engines/mohawk/cstime.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 17:26:09 UTC (rev 55439)
+++ scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 17:33:44 UTC (rev 55440)
@@ -200,6 +200,7 @@
 	_case->setCurrScene(_nextSceneId);
 	CSTimeScene *scene = _case->getCurrScene();
 	// TODO: scene->setState(1);
+	scene->_visitCount++;
 	scene->installGroup();
 
 	_interface->draw();
@@ -210,8 +211,11 @@
 	addEvent(CSTimeEvent(kCSTimeEventWait, 0xffff, 500));
 	scene->idleAmbientAnims();
 	// TODO: startEnvironmentSound();
-	// TODO: queue one of the scene event queues, depending on whether a value is <= 1 or not
-	addEventList(scene->getEvents(false));
+	if (scene->_visitCount == 1) {
+		addEventList(scene->getEvents(false));
+	} else {
+		addEventList(scene->getEvents(true));
+	}
 	_view->idleView();
 	// TODO: maybe startMusic();
 }

Modified: scummvm/trunk/engines/mohawk/cstime_game.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-22 17:26:09 UTC (rev 55439)
+++ scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-22 17:33:44 UTC (rev 55440)
@@ -750,6 +750,7 @@
 }
 
 CSTimeScene::CSTimeScene(MohawkEngine_CSTime *vm, CSTimeCase *case_, uint id) : _vm(vm), _case(case_), _id(id) {
+	_visitCount = 0;
 	_activeChar = NULL;
 	_currHotspot = 0xffff;
 	_hoverHotspot = 0xffff;

Modified: scummvm/trunk/engines/mohawk/cstime_game.h
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_game.h	2011-01-22 17:26:09 UTC (rev 55439)
+++ scummvm/trunk/engines/mohawk/cstime_game.h	2011-01-22 17:33:44 UTC (rev 55440)
@@ -220,6 +220,7 @@
 	uint16 getHelperId() { return _helperId; }
 	uint getId() { return _id; }
 
+	uint _visitCount;
 	CSTimeChar *_activeChar;
 
 	Common::Array<Feature *> _objectFeatures;


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