[Scummvm-cvs-logs] SF.net SVN: scummvm:[53844] scummvm/trunk/engines/lastexpress

littleboy at users.sourceforge.net littleboy at users.sourceforge.net
Tue Oct 26 08:55:17 CEST 2010


Revision: 53844
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53844&view=rev
Author:   littleboy
Date:     2010-10-26 06:55:17 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Make GameState::time of type TimeValue

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/entities/anna.cpp
    scummvm/trunk/engines/lastexpress/entities/ivo.cpp
    scummvm/trunk/engines/lastexpress/entities/milos.cpp
    scummvm/trunk/engines/lastexpress/entities/salko.cpp
    scummvm/trunk/engines/lastexpress/entities/vesna.cpp
    scummvm/trunk/engines/lastexpress/game/action.cpp
    scummvm/trunk/engines/lastexpress/game/logic.cpp
    scummvm/trunk/engines/lastexpress/game/menu.cpp
    scummvm/trunk/engines/lastexpress/game/scenes.cpp
    scummvm/trunk/engines/lastexpress/game/state.h

Modified: scummvm/trunk/engines/lastexpress/entities/anna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -3200,7 +3200,7 @@
 			if (params->param1)
 				getLogic()->gameOver(kSavegameTypeIndex, 0, kSceneNone, params->param1 == Fight::kFightEndLost);
 			else {
-				getState()->time += 1800;
+				getState()->time = (TimeValue)(getState()->time + 1800);
 
 				setCallback(3);
 				setup_savegame(kSavegameTypeEvent, kEventAnnaBagagePart2);

Modified: scummvm/trunk/engines/lastexpress/entities/ivo.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/ivo.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/entities/ivo.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -802,7 +802,7 @@
 		break;
 
 	case kActionDefault:
-		getState()->time += 1800;
+		getState()->time = (TimeValue)(getState()->time + 1800);
 
 		setCallback(1);
 		setup_savegame(kSavegameTypeTime, kTimeNone);

Modified: scummvm/trunk/engines/lastexpress/entities/milos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/milos.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/entities/milos.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -618,7 +618,7 @@
 			if (params->param8) {
 				getLogic()->gameOver(kSavegameTypeIndex, 0, kSceneNone, params->param8  == Fight::kFightEndLost);
 			} else {
-				getState()->time += 1800;
+				getState()->time = (TimeValue)(getState()->time + 1800);
 				getProgress().field_CC = 1;
 
 				setCallback(getCallback() + 1);

Modified: scummvm/trunk/engines/lastexpress/entities/salko.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/salko.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/entities/salko.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -611,7 +611,7 @@
 			params->param1 = getFight()->setup(kFightSalko);
 
 			if (params->param1 == Fight::kFightEndWin) {
-				getState()->time += 1800;
+				getState()->time = (TimeValue)(getState()->time + 1800);
 				setCallback(3);
 				setup_savegame(kSavegameTypeEvent, kEventCathSalkoTrainTopWin);
 			} else {

Modified: scummvm/trunk/engines/lastexpress/entities/vesna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/vesna.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/entities/vesna.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -1122,7 +1122,7 @@
 			} else {
 				getSound()->playSound(kEntityPlayer, "TUNNEL");
 
-				getState()->time += 1800;
+				getState()->time = (TimeValue)(getState()->time + 1800);
 
 				setCallback(5);
 				setup_savegame(kSavegameTypeEvent, kEventCathVesnaTrainTopWin);

Modified: scummvm/trunk/engines/lastexpress/game/action.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/action.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/game/action.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -1958,7 +1958,7 @@
 
 	// Adjust game time
 	getState()->timeTicks += _animationList[index].time;
-	getState()->time += _animationList[index].time * getState()->timeDelta;
+	getState()->time = (TimeValue)(getState()->time + _animationList[index].time * getState()->timeDelta);
 }
 
 } // End of namespace LastExpress

Modified: scummvm/trunk/engines/lastexpress/game/logic.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/logic.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/game/logic.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -316,7 +316,7 @@
 	// Adjust time and save game if needed
 	if (getFlags()->isGameRunning) {
 		getState()->timeTicks += ticks;
-		getState()->time += ticks * getState()->timeDelta;
+		getState()->time = (TimeValue)(getState()->time + ticks * getState()->timeDelta);
 
 		if (getState()->timeDelta) {
 

Modified: scummvm/trunk/engines/lastexpress/game/menu.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/menu.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/game/menu.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -1143,7 +1143,7 @@
 	if (!SaveLoad::isSavegamePresent(_gameId))
 		getSaveLoad()->create(_gameId);
 
-	getState()->time = 0;
+	getState()->time = kTimeNone;
 
 	// Clear menu elements
 	_clock->clear();

Modified: scummvm/trunk/engines/lastexpress/game/scenes.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/scenes.cpp	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/game/scenes.cpp	2010-10-26 06:55:17 UTC (rev 53844)
@@ -1077,7 +1077,7 @@
 	case Scene::kTypeList: {
 
 		// Adjust time
-		getState()->time += (scene->param1 + 10) * getState()->timeDelta;
+		getState()->time = (TimeValue)(getState()->time + (scene->param1 + 10) * getState()->timeDelta);
 		getState()->timeTicks += (scene->param1 + 10);
 
 		// Wait for a number of frames unless right mouse is clicked

Modified: scummvm/trunk/engines/lastexpress/game/state.h
===================================================================
--- scummvm/trunk/engines/lastexpress/game/state.h	2010-10-26 05:19:24 UTC (rev 53843)
+++ scummvm/trunk/engines/lastexpress/game/state.h	2010-10-26 06:55:17 UTC (rev 53844)
@@ -596,7 +596,7 @@
 
 		// Game data
 		uint32 field_0;
-		uint32 time;
+		TimeValue time;
 		uint32 timeDelta;
 		uint32 timeTicks;
 		bool sceneUseBackup;       // byte
@@ -612,7 +612,7 @@
 			volume = _defaultVolume;
 
 			//Game data
-			time = _defaultTime;
+			time = kTimeCityParis;
 			timeDelta = _defaultTimeDelta;
 			timeTicks = 0;
 			sceneUseBackup = false;
@@ -728,9 +728,8 @@
 	static void getHourMinutes(uint32 time, uint8 *hours, uint8 *minutes);
 
 private:
-	static const uint32 _defaultBrigthness = 0x3;
-	static const uint32 _defaultVolume = 0x7;
-	static const uint32 _defaultTime = 1037700;
+	static const uint32 _defaultBrigthness = 3;
+	static const uint32 _defaultVolume = 7;
 	static const uint32 _defaultTimeDelta = 3;
 	static const uint32 _defaultPortrait = 32;
 


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