Revert "please god, make these the final fixes. Perhaps this was a mistake :("

This reverts commit 8d3fdfd.

Author: Causeless

Source/Entities/MovableObject.cpp

@@ -267,10 +267,9 @@ int MovableObject::Create(const MovableObject& reference) {
 	m_ObjectValueMap = reference.m_ObjectValueMap;
 
 	// If we're currently performing a game save or load we want to persist our existing IDs
-	if (g_MovableMan.ShouldPersistUniqueIDs() && reference.m_UniqueID != 0) {
-		m_UniqueID = reference.m_UniqueID;
+	if (g_MovableMan.ShouldPersistUniqueIDs()) {
+		m_UniqueID = reference.m_UniqueID == 0 ? g_MovableMan.GetNextUniqueID() : reference.m_UniqueID;
 		m_AgeTimer = reference.m_AgeTimer;
-		const_cast<MovableObject&>(reference).m_UniqueID = 0; // fuck it, stop it deregistering us
 	} else {
 		// Otherwise we're copying from a preset normally and ought to create a new object
 		m_UniqueID = g_MovableMan.GetNextUniqueID();

Source/Managers/ActivityMan.cpp

@@ -128,12 +128,12 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		}
 	}
 
+	writer->NewPropertyWithValue("MaxUniqueID", currentMaxID);
+	writer->NewPropertyWithValue("CurrentSimTicks", g_TimerMan.GetSimTickCount());
 	writer->NewPropertyWithValue("OriginalScenePresetName", scene->GetPresetName());
 	writer->NewPropertyWithValue("PlaceObjectsIfSceneIsRestarted", g_SceneMan.GetPlaceObjectsOnLoad());
 	writer->NewPropertyWithValue("PlaceUnitsIfSceneIsRestarted", g_SceneMan.GetPlaceUnitsOnLoad());
 	writer->NewPropertyWithValue("Scene", modifiableScene.get());
-	writer->NewPropertyWithValue("MaxUniqueID", currentMaxID);
-	writer->NewPropertyWithValue("CurrentSimTicks", g_TimerMan.GetSimTickCount());
 
 	auto saveWriterData = [](Writer* writerToSave) {
 		writerToSave->EndWrite();
@@ -181,7 +181,11 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	bool placeUnitsIfSceneIsRestarted = true;
 	while (reader.NextProperty()) {
 		std::string propName = reader.ReadPropName();
-		if (propName == "Activity") {
+		if (propName == "MaxUniqueID") {
+			reader >> maxUniqueID;
+		} else if (propName == "CurrentSimTicks") {
+			reader >> simTimeTicks;
+		} else if (propName == "Activity") {
 			reader >> activity.get();
 		} else if (propName == "OriginalScenePresetName") {
 			reader >> originalScenePresetName;
@@ -191,11 +195,7 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 			reader >> placeUnitsIfSceneIsRestarted;
 		} else if (propName == "Scene") {
 			reader >> scene.get();
-	    } else if (propName == "MaxUniqueID") {
-		    reader >> maxUniqueID;
-	    } else if (propName == "CurrentSimTicks") {
-		    reader >> simTimeTicks;
-	    }
+		}
 	}
 
 	g_MovableMan.SetShouldPersistUniqueIDs(true);