Skip to content

Commit 1d45d5f

Browse files
committed
Revert "Fixed crash due to negative timings"
This reverts commit f2ab8b1.
1 parent 86a12e9 commit 1d45d5f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4444

4545
- The Signal Hunt activity no longer has a preview image, as it was not formatted correctly and spoiled the interior structure of the cave.
4646

47-
- `MovableObject`'s `UniqueID` field is now persisted through game save/load.
47+
- `MovableObject`'s `UniqueID` and `Age` fields are now persisted through game save/load.
4848

4949
</details>
5050

Source/Managers/ActivityMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
209209
}
210210

211211
g_MovableMan.SetShouldPersistUniqueIDs(false);
212-
//g_TimerMan.SetSimTickCount(simTimeTicks); // Don't do for now... causes issues with negative times in places
212+
g_TimerMan.SetSimTickCount(simTimeTicks);
213213

214214
// When this method exits, our Scene object will be destroyed, which will cause problems if you try to restart it. To avoid this, set the Scene to load to the preset object with the same name.
215215
g_SceneMan.SetSceneToLoad(originalScenePresetName, placeObjectsIfSceneIsRestarted, placeUnitsIfSceneIsRestarted);

0 commit comments

Comments
 (0)