Fix delayed deallocation when there're multiple parallel interpreters

Author: Zegeri

src/game_commonevent.cpp

@@ -51,10 +51,12 @@ void Game_CommonEvent::Refresh() {
 								  : static_cast<Game_Interpreter*>(new Game_Interpreter_Map()));
 				Update();
 			}
-		} else {
-			interpreter.reset();
+			return;
 		}
-	} else {
+	}
+	if (interpreter) {
+		interpreter->Clear();
+		Game_Map::ReserveInterpreterDeletion(interpreter);
 		interpreter.reset();
 	}
 }
@@ -63,13 +65,11 @@ void Game_CommonEvent::Update() {
 	CheckEventTriggerAuto();
 
 	if (interpreter) {
-		Game_Map::SetParallelInterpreter(interpreter);
 		if (!interpreter->IsRunning()) {
 			interpreter->Setup(GetList(), 0, -common_event_id, -2);
 		} else {
 			interpreter->Update();
 		}
-		Game_Map::SetParallelInterpreter(EASYRPG_SHARED_PTR<Game_Interpreter>());
 	}
 }
 

src/game_event.cpp

@@ -241,6 +241,13 @@ void Game_Event::ClearStarting() {
 void Game_Event::Setup(RPG::EventPage* new_page) {
 	page = new_page;
 
+	// Free resources if needed
+	if (interpreter) {
+		interpreter->Clear();
+		Game_Map::ReserveInterpreterDeletion(interpreter);
+		interpreter.reset();
+	}
+
 	if (page == NULL) {
 		tile_id = 0;
 		SetSpriteName("");
@@ -249,7 +256,6 @@ void Game_Event::Setup(RPG::EventPage* new_page) {
 		//move_type = 0;
 		trigger = -1;
 		list.clear();
-		interpreter.reset();
 		return;
 	}
 	SetSpriteName(page->character_name);
@@ -279,11 +285,6 @@ void Game_Event::Setup(RPG::EventPage* new_page) {
 	trigger = page->trigger;
 	list = page->event_commands;
 
-	// Free resources if needed
-	if (interpreter) {
-		interpreter->Clear();
-		interpreter.reset();
-	}
 	if (trigger == RPG::EventPage::Trigger_parallel) {
 		interpreter.reset(new Game_Interpreter_Map());
 	}
@@ -494,13 +495,11 @@ void Game_Event::Update() {
 	CheckEventTriggerAuto();
 
 	if (interpreter) {
-		Game_Map::SetParallelInterpreter(interpreter);
 		if (!interpreter->IsRunning()) {
 			interpreter->Setup(list, event.ID, -event.x, event.y);
 		} else {
 			interpreter->Update();
 		}
-		Game_Map::SetParallelInterpreter(EASYRPG_SHARED_PTR<Game_Interpreter>());
 	}
 }
 

src/game_map.cpp

@@ -63,7 +63,7 @@ namespace {
 	int scroll_speed;
 
 	boost::scoped_ptr<Game_Interpreter> interpreter;
-	EASYRPG_SHARED_PTR<Game_Interpreter> parallel_interpreter;
+	std::vector<EASYRPG_SHARED_PTR<Game_Interpreter>> free_interpreters;
 	Game_Vehicle* vehicles[3];
 
 	bool pan_locked;
@@ -306,12 +306,8 @@ Game_Interpreter& Game_Map::GetInterpreter() {
 	return *interpreter;
 }
 
-EASYRPG_SHARED_PTR<Game_Interpreter> Game_Map::GetParallelInterpreter() {
-	return parallel_interpreter;
-}
-
-void Game_Map::SetParallelInterpreter(EASYRPG_SHARED_PTR<Game_Interpreter> interpreter) {
-	parallel_interpreter = interpreter;
+void Game_Map::ReserveInterpreterDeletion(EASYRPG_SHARED_PTR<Game_Interpreter> interpreter) {
+	free_interpreters.push_back(interpreter);
 }
 
 void Game_Map::ScrollDown(int distance) {
@@ -679,6 +675,8 @@ void Game_Map::Update() {
 
 	for (int i = 0; i < 3; ++i)
 		vehicles[i]->Update();
+
+	free_interpreters.clear();
 }
 
 RPG::Map const& Game_Map::GetMap() {

src/game_map.h

@@ -392,19 +392,11 @@ namespace Game_Map {
 	Game_Interpreter& GetInterpreter();
 
 	/**
-	 * Gets the currently running parallel interpreter.
+	 * Destroy an interpreter after all events and common events have been updated.
 	 *
-	 * @return running parallel interpreter.
+	 * @param interpreter to destroy.
 	 */
-	EASYRPG_SHARED_PTR<Game_Interpreter> GetParallelInterpreter();
-
-	/**
-	 * Sets the currently running parallel interpreter.
-	 * Used to hold a 2nd stromg reference to prevent destruction on refresh.
-	 *
-	 * @param interpreter executed interpreter.
-	 */
-	void SetParallelInterpreter(EASYRPG_SHARED_PTR<Game_Interpreter> interpreter);
+	void ReserveInterpreterDeletion(EASYRPG_SHARED_PTR<Game_Interpreter> interpreter);
 
 	/**
 	 * Sets the need refresh flag.