Merge pull request #325 from Ghabry/development

Parallel Event segfaulting

Author: fdelapena

src/game_character.cpp

@@ -94,7 +94,7 @@ bool Game_Character::IsPassable(int x, int y, int d) const {
 	if (!Game_Map::IsValid(new_x, new_y))
 		return false;
 
-	if (through) return true;
+	if (GetThrough()) return true;
 
 	if (!Game_Map::IsPassable(x, y, d, this))
 		return false;
@@ -116,7 +116,7 @@ bool Game_Character::IsLandable(int x, int y) const
 	if (!Game_Map::IsValid(x, y))
 		return false;
 
-	if (through) return true;
+	if (GetThrough()) return true;
 
 	if (!Game_Map::IsLandable(x, y, this))
 		return false;

src/game_character.h

@@ -646,7 +646,7 @@ class Game_Character {
 	 *
 	 * @return through flag.
 	 */
-	bool GetThrough() const;
+	virtual bool GetThrough() const;
 
 	/**
 	 * Gets animation ID.

src/game_commonevent.cpp

@@ -25,14 +25,12 @@
 
 Game_CommonEvent::Game_CommonEvent(int common_event_id, bool battle) :
 	common_event_id(common_event_id),
-	battle(battle),
-	interpreter(NULL) {
+	battle(battle) {
 }
 
 Game_CommonEvent::Game_CommonEvent(int common_event_id, bool battle, const RPG::SaveCommonEvent& data) :
 	common_event_id(common_event_id),
-	battle(battle),
-	interpreter(NULL) {
+	battle(battle) {
 
 	if (!data.event_data.commands.empty()) {
 		interpreter.reset(new Game_Interpreter_Map());
@@ -65,11 +63,13 @@ 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_commonevent.h

@@ -107,7 +107,7 @@ class Game_CommonEvent {
 	bool battle;
 
 	/** Interpreter for parallel common events. */
-	boost::scoped_ptr<Game_Interpreter> interpreter;
+	EASYRPG_SHARED_PTR<Game_Interpreter> interpreter;
 };
 
 #endif

src/game_event.cpp

@@ -37,7 +37,6 @@ Game_Event::Game_Event(int map_id, const RPG::Event& event) :
 	from_save(false) {
 
 	ID = event.ID;
-	through = true;
 
 	SetMapId(map_id);
 	MoveTo(event.x, event.y);
@@ -225,6 +224,10 @@ void Game_Event::SetFlashTimeLeft(int time_left) {
 	data.flash_time_left = time_left;
 }
 
+bool Game_Event::GetThrough() const {
+	return page == NULL || Game_Character::GetThrough();
+}
+
 void Game_Event::ClearStarting() {
 	starting = false;
 }
@@ -238,7 +241,6 @@ void Game_Event::Setup(RPG::EventPage* new_page) {
 		SetSpriteIndex(0);
 		SetDirection(RPG::EventPage::Direction_down);
 		//move_type = 0;
-		through = true;
 		trigger = -1;
 		list.clear();
 		interpreter.reset();
@@ -258,23 +260,24 @@ void Game_Event::Setup(RPG::EventPage* new_page) {
 		pattern = page->character_pattern;
 		original_pattern = pattern;
 	}
-	//opacity = page.opacity;
-	//opacity = page.translucent ? 192 : 255;
-	//blend_type = page.blend_type;
+	
 	move_type = page->move_type;
 	SetMoveSpeed(page->move_speed);
 	SetMoveFrequency(page->move_frequency);
 	original_move_route = page->move_route;
 	SetOriginalMoveRouteIndex(0);
 	animation_type = page->animation_type;
+	SetOpacity(page->translucent ? 160 : 255);
 
 	SetLayer(page->layer);
 	trigger = page->trigger;
 	list = page->event_commands;
-	through = false;
 
 	// Free resources if needed
-	interpreter.reset();
+	if (interpreter) {
+		interpreter->Clear();
+		interpreter.reset();
+	}
 	if (trigger == RPG::EventPage::Trigger_parallel) {
 		interpreter.reset(new Game_Interpreter_Map());
 	}
@@ -467,7 +470,6 @@ bool Game_Event::CheckEventTriggerTouch(int x, int y) {
 		return false;
 
 	if ((trigger == RPG::EventPage::Trigger_collision) && (Main_Data::game_player->IsInPosition(x, y))) {
-
 		// TODO check over trigger VX differs from XP here
 		if (!IsJumping()) {
 			Start();
@@ -477,8 +479,6 @@ bool Game_Event::CheckEventTriggerTouch(int x, int y) {
 	return true;
 }
 
-
-
 void Game_Event::Update() {
 	if (!data.active) {
 		return;
@@ -488,13 +488,14 @@ 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>());
 	}
-
 }
 
 RPG::Event& Game_Event::GetEvent() {

src/game_event.h

@@ -119,6 +119,13 @@ class Game_Event : public Game_Character {
 	 */
 	int GetTrigger() const;
 
+	/**
+	 * Gets through state.
+	 *
+	 * @return Event has through state or has a null-page.
+	 */
+	bool GetThrough() const;
+
 	/**
 	 * Gets event commands list.
 	 *
@@ -149,7 +156,6 @@ class Game_Event : public Game_Character {
 	RPG::Event& GetEvent();
 
 	const RPG::SaveMapEvent& GetSaveData();
-
 private:
 	// Not a reference on purpose.
 	// Events change during map change and old are destroyed, breaking the
@@ -162,7 +168,7 @@ class Game_Event : public Game_Character {
 	RPG::Event event;
 	RPG::EventPage* page;
 	std::vector<RPG::EventCommand> list;
-	boost::scoped_ptr<Game_Interpreter> interpreter;
+	EASYRPG_SHARED_PTR<Game_Interpreter> interpreter;
 	bool from_save;
 };
 

src/game_interpreter.cpp

@@ -72,6 +72,7 @@ void Game_Interpreter::Clear() {
 	child_interpreter.reset();		// child interpreter for common events, etc
 	continuation = NULL;			// function to execute to resume command
 	button_timer = 0;
+	list.clear();
 }
 
 // Is interpreter running.
@@ -366,7 +367,12 @@ void Game_Interpreter::InputButton() {
 
 bool Game_Interpreter::CommandEnd() {
 	CloseMessageWindow();
-	Game_Message::FullClear();
+
+	// FIXME: Hangs in some cases when Autostart events start
+	//if (main_flag) {
+	//	Game_Message::FullClear();
+	//}
+
 	list.clear();
 
 	if ((main_flag) && (event_id > 0)) {

src/game_map.cpp

@@ -63,6 +63,7 @@ namespace {
 	int scroll_speed;
 
 	boost::scoped_ptr<Game_Interpreter> interpreter;
+	EASYRPG_SHARED_PTR<Game_Interpreter> parallel_interpreter;
 	Game_Vehicle* vehicles[3];
 
 	bool pan_locked;
@@ -296,6 +297,7 @@ void Game_Map::Refresh() {
 			i->second->Refresh();
 		}
 	}
+
 	need_refresh = false;
 }
 
@@ -304,6 +306,14 @@ 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::ScrollDown(int distance) {
 	map_info.position_y = min(map_info.position_y + distance, (GetHeight() - 15) * SCREEN_TILE_WIDTH);
 }
@@ -653,7 +663,7 @@ void Game_Map::UpdateScroll() {
 }
 
 void Game_Map::Update() {
-	if (need_refresh) Refresh();
+	if (GetNeedRefresh()) Refresh();
 	UpdateScroll();
 	UpdatePan();
 	UpdateParallax();

src/game_map.h

@@ -391,6 +391,21 @@ namespace Game_Map {
 	 */
 	Game_Interpreter& GetInterpreter();
 
+	/**
+	 * Gets the currently running parallel interpreter.
+	 *
+	 * @return running parallel interpreter.
+	 */
+	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);
+
 	/**
 	 * Sets the need refresh flag.
 	 *