Merge pull request #3032 from Ghabry/ipomoea

Support game Ipomoea
EasyRPG · Jul 5, 2023 · ba071e2 · ba071e2
2 parents 7ec7624 + 5aa0b03
commit ba071e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/game_interpreter_control_variables.cpp b/src/game_interpreter_control_variables.cpp
@@ -205,6 +205,9 @@ int ControlVariables::Event(int op, int event_id, const Game_Interpreter& interp
 					return character->GetScreenY();
 				}
 			}
+			case 6:
+				// Event ID
+				return Player::IsPatchManiac() ? interpreter.GetThisEventId() : 0;
 		}
 
 		Output::Warning("ControlVariables::Event: Unknown op {}", op);

diff --git a/src/player.cpp b/src/player.cpp
@@ -850,9 +850,9 @@ bool Player::ChangeResolution(int width, int height) {
 
 	Player::screen_width = width;
 	Player::screen_height = height;
-	Player::menu_offset_x = (Player::screen_width - MENU_WIDTH) / 2;
-	Player::menu_offset_y = (Player::screen_height - MENU_HEIGHT) / 2;
-	Player::message_box_offset_x = (Player::screen_width - MENU_WIDTH) / 2;
+	Player::menu_offset_x = std::max<int>((Player::screen_width - MENU_WIDTH) / 2, 0);
+	Player::menu_offset_y = std::max<int>((Player::screen_height - MENU_HEIGHT) / 2, 0);
+	Player::message_box_offset_x = std::max<int>((Player::screen_width - MENU_WIDTH) / 2, 0);
 
 	Graphics::GetMessageOverlay().OnResolutionChange();
 
@@ -1182,7 +1182,7 @@ void Player::LoadSavegame(const std::string& save_name, int save_id) {
 	} else {
 		// Increment frame counter for consistency with a normal savegame load
 		IncFrame();
-		Scene::instance->Start();
+		static_cast<Scene_Map*>(Scene::instance.get())->StartFromSave(save_id);
 	}
 }
 

diff --git a/src/scene_map.cpp b/src/scene_map.cpp
@@ -96,6 +96,11 @@ void Scene_Map::Start() {
 	Start2(MapUpdateAsyncContext());
 }
 
+void Scene_Map::StartFromSave(int from_save_id) {
+	this->from_save_id = from_save_id;
+	Start();
+}
+
 void Scene_Map::Start2(MapUpdateAsyncContext actx) {
 	PreUpdate(actx);
 

diff --git a/src/scene_map.h b/src/scene_map.h
@@ -39,6 +39,7 @@ class Scene_Map: public Scene {
 	~Scene_Map();
 
 	void Start() override;
+	void StartFromSave(int from_save_id);
 	void Continue(SceneType prev_scene) override;
 	void vUpdate() override;
 	void TransitionIn(SceneType prev_scene) override;

diff --git a/src/window_message.cpp b/src/window_message.cpp
@@ -270,7 +270,7 @@ void Window_Message::InsertNewPage() {
 		y = Player::menu_offset_y;
 	}
 	else if (Game_Message::GetRealPosition() == 1) {
-		y = (Player::screen_height / (float)2) - (MESSAGE_BOX_HEIGHT / (float)2);
+		y = static_cast<int>((Player::screen_height - MESSAGE_BOX_HEIGHT) / 2.f);
 	}
 	else if (Game_Message::GetRealPosition() == 2) {
 		y = Player::screen_height - Player::menu_offset_y - MESSAGE_BOX_HEIGHT ;