Merge pull request #3 from Ghabry/events

Layered common events misbehave

src/game_interpreter.cpp

@@ -262,8 +262,9 @@ bool Game_Interpreter::SkipTo(int code, int code2, int min_indent, int max_inden
 		index = idx;
 		return true;
 	}
-
-	return false;
+	// if you do not find it set the page size so the easy do not stuck
+		index = list.size()-1;
+		return true;
 }
 
 // Execute Command.

src/game_interpreter.h

@@ -65,7 +65,7 @@ class Game_Interpreter
 	bool main_flag;
 
 	int loop_count;
-
+	
 	bool move_route_waiting;
 
 	int button_input_variable_id;

src/game_interpreter_map.cpp

@@ -418,6 +418,8 @@ bool Game_Interpreter_Map::CommandRecallToLocation(RPG::EventCommand const& com)
 	}
 
 	Main_Data::game_player->ReserveTeleport(map_id, x, y);
+	Main_Data::game_player->StartTeleport();
+
 	index++;
 
 	return false;

src/window_message.cpp

@@ -245,7 +245,7 @@ void Window_Message::Update() {
 	Window_Selectable::Update();
 	number_input_window->Update();
 
-	if (visible && !Game_Message::visible) {
+	if (!IsNextMessagePossible() && visible && !Game_Message::visible) {
 		// The Event Page ended but the MsgBox was used in this Event
 		// It can be closed now.
 		TerminateMessage();