diff options
Diffstat (limited to 'engines/lastexpress/game')
-rw-r--r-- | engines/lastexpress/game/action.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/game/logic.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/game/menu.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/game/scenes.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/game/state.h | 9 |
5 files changed, 8 insertions, 9 deletions
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp index ade2619185..e98a1dc276 100644 --- a/engines/lastexpress/game/action.cpp +++ b/engines/lastexpress/game/action.cpp @@ -1958,7 +1958,7 @@ void Action::playAnimation(EventIndex index, bool debugMode) const { // 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 diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp index 87cf2b54e3..75e237df4a 100644 --- a/engines/lastexpress/game/logic.cpp +++ b/engines/lastexpress/game/logic.cpp @@ -316,7 +316,7 @@ void Logic::eventTick(const Common::Event &) { // 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) { diff --git a/engines/lastexpress/game/menu.cpp b/engines/lastexpress/game/menu.cpp index ab95fd30c4..dd59f0384c 100644 --- a/engines/lastexpress/game/menu.cpp +++ b/engines/lastexpress/game/menu.cpp @@ -1143,7 +1143,7 @@ void Menu::switchGame() { if (!SaveLoad::isSavegamePresent(_gameId)) getSaveLoad()->create(_gameId); - getState()->time = 0; + getState()->time = kTimeNone; // Clear menu elements _clock->clear(); diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp index 57578645d0..7a601b504b 100644 --- a/engines/lastexpress/game/scenes.cpp +++ b/engines/lastexpress/game/scenes.cpp @@ -1077,7 +1077,7 @@ void SceneManager::postProcessScene() { 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 diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h index a1b67df476..07c1844efa 100644 --- a/engines/lastexpress/game/state.h +++ b/engines/lastexpress/game/state.h @@ -596,7 +596,7 @@ public: // Game data uint32 field_0; - uint32 time; + TimeValue time; uint32 timeDelta; uint32 timeTicks; bool sceneUseBackup; // byte @@ -612,7 +612,7 @@ public: volume = _defaultVolume; //Game data - time = _defaultTime; + time = kTimeCityParis; timeDelta = _defaultTimeDelta; timeTicks = 0; sceneUseBackup = false; @@ -728,9 +728,8 @@ public: 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; |