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

Author: xezon

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

@@ -421,6 +421,10 @@ 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
@@ -433,9 +437,6 @@ 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,6 +436,10 @@ 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);
@@ -447,9 +451,6 @@ void GameLogic::reset( void )
 	m_mouseVisibleMemory = TRUE;
 	setFPMode();
 
-	// destroy all objects
-	destroyAllObjectsImmediate();
-
 	m_nextObjID = (ObjectID)1;
 
 	m_frameObjectsChangedTriggerAreas = 0;