[GEN][ZH] Fix use of invalidated iterator in ScriptEngine::reset() (#1273)

Author: xezon

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

@@ -4639,10 +4639,18 @@ void ScriptEngine::reset( void )
 
 	_updateCurrentParticleCap();
 
-	VecSequentialScriptPtrIt seqScriptIt;
-	for (seqScriptIt = m_sequentialScripts.begin(); seqScriptIt != m_sequentialScripts.end(); ) {
-		cleanupSequentialScript(seqScriptIt, TRUE);
+	// delete and clear all sequential scripts.
+	VecSequentialScriptPtrIt seqScriptIt = m_sequentialScripts.begin();
+	while (seqScriptIt != m_sequentialScripts.end()) {
+		SequentialScript* seqScript = *seqScriptIt;
+		while (seqScript != NULL) {
+			SequentialScript* scriptToDelete = seqScript;
+			seqScript = seqScript->m_nextScriptInSequence;
+			deleteInstance(scriptToDelete);
+		}
+		++seqScriptIt;
 	}
+	m_sequentialScripts.clear();
 
 	// clear out all the lists of object types that were in the old map.
 	for (AllObjectTypesIt it = m_allObjectTypeLists.begin(); it != m_allObjectTypeLists.end(); it = m_allObjectTypeLists.begin() ) {

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

@@ -5374,10 +5374,18 @@ void ScriptEngine::reset( void )
 
 	_updateCurrentParticleCap();
 
-	VecSequentialScriptPtrIt seqScriptIt;
-	for (seqScriptIt = m_sequentialScripts.begin(); seqScriptIt != m_sequentialScripts.end(); ) {
-		cleanupSequentialScript(seqScriptIt, TRUE);
+	// delete and clear all sequential scripts.
+	VecSequentialScriptPtrIt seqScriptIt = m_sequentialScripts.begin();
+	while (seqScriptIt != m_sequentialScripts.end()) {
+		SequentialScript* seqScript = *seqScriptIt;
+		while (seqScript != NULL) {
+			SequentialScript* scriptToDelete = seqScript;
+			seqScript = seqScript->m_nextScriptInSequence;
+			deleteInstance(scriptToDelete);
+		}
+		++seqScriptIt;
 	}
+	m_sequentialScripts.clear();
 
 	// clear out all the lists of object types that were in the old map.
 	for (AllObjectTypesIt it = m_allObjectTypeLists.begin(); it != m_allObjectTypeLists.end(); it = m_allObjectTypeLists.begin() ) {