Revert "[GEN][ZH] Refactor GameLogic::reset to avoid "vector subscript out of range" debug error (#645)" (#764)

This reverts commit bbf0830.

Author: Mauller

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -421,10 +421,6 @@ void GameLogic::reset( void )
 	m_thingTemplateBuildableOverrides.clear();
 	m_controlBarOverrides.clear();
 
-	// destroy all objects
-	// TheSuperHackers @info xezon 10/04/2025 Objects need to be destroyed before clearing the object hash.
-	destroyAllObjectsImmediate();
-
 	// set the hash to be rather large. We need to optimize this value later.
 	m_objHash.clear();
 #if USING_STLPORT
@@ -437,6 +433,9 @@ void GameLogic::reset( void )
 	m_mouseVisibleMemory = TRUE;
 	setFPMode();
 
+	// destroy all objects
+	destroyAllObjectsImmediate();
+
 	m_nextObjID = (ObjectID)1;
 
 	m_frameObjectsChangedTriggerAreas = 0;

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -436,10 +436,6 @@ void GameLogic::reset( void )
 	m_thingTemplateBuildableOverrides.clear();
 	m_controlBarOverrides.clear();
 
-	// destroy all objects
-	// TheSuperHackers @info xezon 10/04/2025 Objects need to be destroyed before clearing the object vector.
-	destroyAllObjectsImmediate();
-
 	// set the hash to be rather large. We need to optimize this value later.
 //	m_objHash.clear();
 //	m_objHash.resize(OBJ_HASH_SIZE);
@@ -451,6 +447,9 @@ void GameLogic::reset( void )
 	m_mouseVisibleMemory = TRUE;
 	setFPMode();
 
+	// destroy all objects
+	destroyAllObjectsImmediate();
+
 	m_nextObjID = (ObjectID)1;
 
 	m_frameObjectsChangedTriggerAreas = 0;