CommandTeleport (10810) - Allow com.string as map filename

src/game_interpreter_map.cpp

@@ -486,6 +486,8 @@ bool Game_Interpreter_Map::CommandTeleport(lcf::rpg::EventCommand const& com) {
 	int x = com.parameters[1];
 	int y = com.parameters[2];
 
+	if (map_id == 0 && com.string != "") Game_Map::SetCustomMapName(com.string);
+
 	// RPG2k3 feature
 	int direction = -1;
 	if (com.parameters.size() > 3 && Player::IsRPG2k3Commands()) {

src/game_map.cpp

@@ -57,6 +57,8 @@
 #include "feature.h"
 
 namespace {
+	std::string custom_map_name = "";
+
 	// Intended bad value, Game_Map::Init sets them correctly
 	int screen_width = -1;
 	int screen_height = -1;
@@ -327,6 +329,7 @@ std::unique_ptr<lcf::rpg::Map> Game_Map::loadMapFile(int map_id) {
 	}
 
 	Output::Debug("Loaded Map {}", map_name);
+	custom_map_name = "";
 
 	if (map.get() == NULL) {
 		Output::ErrorStr(lcf::LcfReader::GetError());
@@ -1278,7 +1281,18 @@ lcf::rpg::Map const& Game_Map::GetMap() {
 }
 
 int Game_Map::GetMapId() {
-	return Main_Data::game_player->GetMapId();
+	int map_id =  Main_Data::game_player->GetMapId();
+	return map_id;
+}
+
+std::string Game_Map::GetCustomMapName() {
+	return custom_map_name;
+}
+
+void Game_Map::SetCustomMapName(lcf::DBString mapName) {
+	custom_map_name = mapName.c_str();
+
+	return;
 }
 
 void Game_Map::PrintPathToMap() {
@@ -1682,7 +1696,13 @@ int Game_Map::SubstituteUp(int old_id, int new_id) {
 
 std::string Game_Map::ConstructMapName(int map_id, bool is_easyrpg) {
 	std::stringstream ss;
-	ss << "Map" << std::setfill('0') << std::setw(4) << map_id;
+
+	if (custom_map_name == "") {
+		ss << "Map" << std::setfill('0') << std::setw(4) << map_id;
+	} else {
+		ss << custom_map_name;
+	}
+
 	if (is_easyrpg) {
 		return Player::fileext_map.MakeFilename(ss.str(), SUFFIX_EMU);
 	} else {
@@ -1694,8 +1714,8 @@ FileRequestAsync* Game_Map::RequestMap(int map_id) {
 #ifdef EMSCRIPTEN
 	Player::translation.RequestAndAddMap(map_id);
 #endif
-
-	return AsyncHandler::RequestFile(Game_Map::ConstructMapName(map_id, false));
+	auto map_name = Game_Map::ConstructMapName(map_id, false);
+	return AsyncHandler::RequestFile(map_name);
 }
 
 // Parallax

src/game_map.h

@@ -381,6 +381,10 @@ namespace Game_Map {
 	 */
 	int GetMapId();
 
+	std::string GetCustomMapName();
+
+	void SetCustomMapName(lcf::DBString mapName);
+
 	/**
 	 * Outputs the path in the map tree to reach the current map.
 	 */

src/game_player.cpp

@@ -104,7 +104,7 @@ void Game_Player::PerformTeleport() {
 		return;
 	}
 
-	if (teleport_target.GetMapId() <= 0) {
+	if (Game_Map::GetCustomMapName() == "" && teleport_target.GetMapId() <= 0) {
 		Output::Error("Invalid Teleport map id! mapid={} x={} y={} d={}", teleport_target.GetMapId(),
 				teleport_target.GetX(), teleport_target.GetY(), teleport_target.GetDirection());
 	}