[Scummvm-cvs-logs] SF.net SVN: scummvm:[53925] scummvm/trunk/engines/draci
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri Oct 29 18:54:10 CEST 2010
Revision: 53925
http://scummvm.svn.sourceforge.net/scummvm/?rev=53925&view=rev
Author: lordhoto
Date: 2010-10-29 16:54:10 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
DRACI: Switch to the new play time counting of the Engine class.
Modified Paths:
--------------
scummvm/trunk/engines/draci/detection.cpp
scummvm/trunk/engines/draci/draci.cpp
scummvm/trunk/engines/draci/draci.h
scummvm/trunk/engines/draci/saveload.cpp
Modified: scummvm/trunk/engines/draci/detection.cpp
===================================================================
--- scummvm/trunk/engines/draci/detection.cpp 2010-10-29 16:53:46 UTC (rev 53924)
+++ scummvm/trunk/engines/draci/detection.cpp 2010-10-29 16:54:10 UTC (rev 53925)
@@ -202,10 +202,7 @@
int minutes = header.time & 0xFF;
desc.setSaveTime(hour, minutes);
- minutes = header.playtime / 60;
- hour = minutes / 60;
- minutes %= 60;
- desc.setPlayTime(hour, minutes);
+ desc.setPlayTime(header.playtime * 1000);
return desc;
}
Modified: scummvm/trunk/engines/draci/draci.cpp
===================================================================
--- scummvm/trunk/engines/draci/draci.cpp 2010-10-29 16:53:46 UTC (rev 53924)
+++ scummvm/trunk/engines/draci/draci.cpp 2010-10-29 16:54:10 UTC (rev 53925)
@@ -403,7 +403,7 @@
Common::Error DraciEngine::run() {
init();
- _engineStartTime = _system->getMillis() / 1000;
+ setTotalPlayTime(0);
_game->init();
// Load game from specified slot, if any
@@ -418,8 +418,6 @@
void DraciEngine::pauseEngineIntern(bool pause) {
Engine::pauseEngineIntern(pause);
if (pause) {
- // Record start of the pause, so that we can later
- // adjust _engineStartTime accordingly.
_pauseStartTime = _system->getMillis();
_anims->pauseAnimations();
@@ -434,7 +432,6 @@
// Adjust engine start time
const int delta = _system->getMillis() - _pauseStartTime;
- _engineStartTime += delta / 1000;
_game->shiftSpeechAndFadeTick(delta);
_pauseStartTime = 0;
}
Modified: scummvm/trunk/engines/draci/draci.h
===================================================================
--- scummvm/trunk/engines/draci/draci.h 2010-10-29 16:53:46 UTC (rev 53924)
+++ scummvm/trunk/engines/draci/draci.h 2010-10-29 16:54:10 UTC (rev 53925)
@@ -107,7 +107,6 @@
Common::RandomSource _rnd;
- int32 _engineStartTime;
int32 _pauseStartTime;
};
Modified: scummvm/trunk/engines/draci/saveload.cpp
===================================================================
--- scummvm/trunk/engines/draci/saveload.cpp 2010-10-29 16:53:46 UTC (rev 53924)
+++ scummvm/trunk/engines/draci/saveload.cpp 2010-10-29 16:54:10 UTC (rev 53925)
@@ -103,7 +103,7 @@
header.saveName = saveName;
header.date = ((curTime.tm_mday & 0xFF) << 24) | (((curTime.tm_mon + 1) & 0xFF) << 16) | ((curTime.tm_year + 1900) & 0xFFFF);
header.time = ((curTime.tm_hour & 0xFF) << 8) | ((curTime.tm_min) & 0xFF);
- header.playtime = vm._system->getMillis() / 1000 - vm._engineStartTime;
+ header.playtime = vm.getTotalPlayTime() / 1000;
writeSavegameHeader(f, header);
if (f->err()) {
@@ -157,7 +157,7 @@
vm->_game->inventoryReload();
- vm->_engineStartTime = vm->_system->getMillis() / 1000 - header.playtime;
+ vm->setTotalPlayTime(header.playtime * 1000);
return Common::kNoError;
}
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