diff options
author | Peter Kohaut | 2018-12-15 22:40:07 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-12-15 23:02:58 +0100 |
commit | 2f242a10daee5d95510c43f686f83e3bfb9e3f50 (patch) | |
tree | f021bbe73487f258fe6002aa65662225937d9c67 /engines/bladerunner/script | |
parent | 1d12eb4c11d2ae89c4b06d86d6af98b5ef02f8fe (diff) | |
download | scummvm-rg350-2f242a10daee5d95510c43f686f83e3bfb9e3f50.tar.gz scummvm-rg350-2f242a10daee5d95510c43f686f83e3bfb9e3f50.tar.bz2 scummvm-rg350-2f242a10daee5d95510c43f686f83e3bfb9e3f50.zip |
BLADERUNNER: Added time control and game pausing
Diffstat (limited to 'engines/bladerunner/script')
-rw-r--r-- | engines/bladerunner/script/police_maze.cpp | 5 | ||||
-rw-r--r-- | engines/bladerunner/script/script.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/bladerunner/script/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp index 284b55dcb0..f201b566c5 100644 --- a/engines/bladerunner/script/police_maze.cpp +++ b/engines/bladerunner/script/police_maze.cpp @@ -29,6 +29,7 @@ #include "bladerunner/scene_objects.h" #include "bladerunner/script/police_maze.h" #include "bladerunner/script/scene_script.h" +#include "bladerunner/time.h" namespace BladeRunner { @@ -78,7 +79,7 @@ void PoliceMaze::setPauseState(bool state) { warning("PAUSE: %d", state); _isPaused = state; - uint32 t = _vm->getTotalPlayTime(); + uint32 t = _vm->_time->current(); for (int i = 0; i < kNumMazeTracks; i++) { _tracks[i]->setTime(t); @@ -207,7 +208,7 @@ bool PoliceMazeTargetTrack::tick() { } uint32 oldTime = _time; - _time = _vm->getTotalPlayTime(); + _time = _vm->_time->current(); int32 timeDiff = _time - oldTime; _timeLeftUpdate -= timeDiff; diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 9d9243afa5..28475d69f5 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -50,6 +50,7 @@ #include "bladerunner/slice_renderer.h" #include "bladerunner/suspects_database.h" #include "bladerunner/text_resource.h" +#include "bladerunner/time.h" #include "bladerunner/ui/elevator.h" #include "bladerunner/ui/esper.h" #include "bladerunner/ui/kia.h" @@ -729,8 +730,8 @@ int ScriptBase::Animation_Skip_To_Frame() { void ScriptBase::Delay(int miliseconds) { Player_Loses_Control(); - int endTime = _vm->getTotalPlayTime() + miliseconds; - while (_vm->_gameIsRunning && (int)_vm->getTotalPlayTime() < endTime) { + int endTime = _vm->_time->current() + miliseconds; + while (_vm->_gameIsRunning && (_vm->_time->current() < endTime)) { _vm->gameTick(); } Player_Gains_Control(); |