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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Oct 28 00:52:03 CEST 2010


Revision: 53895
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53895&view=rev
Author:   lordhoto
Date:     2010-10-27 22:52:02 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
ENGINE: Rename resetTotalPlayTime to setTotalPlayTime.

I also extended the comment for it to show two possible use cases.

Modified Paths:
--------------
    scummvm/trunk/engines/engine.cpp
    scummvm/trunk/engines/engine.h
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp	2010-10-27 22:50:13 UTC (rev 53894)
+++ scummvm/trunk/engines/engine.cpp	2010-10-27 22:52:02 UTC (rev 53895)
@@ -410,7 +410,7 @@
 		return _pauseStartTime - _engineStartTime;
 }
 
-void Engine::resetTotalPlayTime(uint32 time) {
+void Engine::setTotalPlayTime(uint32 time) {
 	const uint32 currentTime = _system->getMillis();
 
 	// We need to reset the pause start time here in case the engine is already

Modified: scummvm/trunk/engines/engine.h
===================================================================
--- scummvm/trunk/engines/engine.h	2010-10-27 22:50:13 UTC (rev 53894)
+++ scummvm/trunk/engines/engine.h	2010-10-27 22:52:02 UTC (rev 53895)
@@ -253,11 +253,15 @@
 	uint32 getTotalPlayTime() const;
 
 	/**
-	 * Reset the game time counter to the specified time.
+	 * Set the game time counter to the specified time.
 	 *
+	 * This can be used to set the play time counter after loading a savegame
+	 * for example. Another use case is in case the engine wants to exclude
+	 * time from the counter the user spent in original engine dialogs.
+	 *
 	 * @param time Play time to set up in ms.
 	 */
-	void resetTotalPlayTime(uint32 time = 0);
+	void setTotalPlayTime(uint32 time = 0);
 
 	inline Common::TimerManager *getTimerManager() { return _timer; }
 	inline Common::EventManager *getEventManager() { return _eventMan; }

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2010-10-27 22:50:13 UTC (rev 53894)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2010-10-27 22:52:02 UTC (rev 53895)
@@ -378,10 +378,10 @@
 			return false;
 		}
 
-		resetTotalPlayTime(infos.playtime * 1000);
+		setTotalPlayTime(infos.playtime * 1000);
 	} else {
 		// start time counting
-		resetTotalPlayTime();
+		setTotalPlayTime();
 	}
 
 	// Due to a bug in scummvm up to and including 0.3.0, save games could be saved

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-10-27 22:50:13 UTC (rev 53894)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-10-27 22:52:02 UTC (rev 53895)
@@ -1927,7 +1927,7 @@
 #pragma mark -
 
 Common::Error ScummEngine::go() {
-	resetTotalPlayTime();
+	setTotalPlayTime();
 
 	// If requested, load a save game instead of running the boot script
 	if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) {


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