diff --git a/include/project.h b/include/project.h index c5599489..4e97a9bd 100644 --- a/include/project.h +++ b/include/project.h @@ -231,7 +231,6 @@ public: private: void updateMapLayout(Map*); - void setNewMapHeader(Map* map, int mapIndex); void setNewMapBlockdata(Map* map); void setNewMapBorder(Map *map); void setNewMapEvents(Map *map); diff --git a/src/project.cpp b/src/project.cpp index 76955169..b6db8f24 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -375,21 +375,6 @@ QString Project::readMapLocation(QString map_name) { return ParseUtil::jsonToQString(mapObj["region_map_section"]); } -void Project::setNewMapHeader(Map* map, int mapIndex) { - map->layoutId = QString("%1").arg(mapIndex); - map->location = mapSectionValueToName.value(0); - map->requiresFlash = false; - map->weather = weatherNames.value(0, "WEATHER_NONE"); - map->type = mapTypes.value(0, "MAP_TYPE_NONE"); - map->song = defaultSong; - map->show_location = true; - map->allowBiking = true; - map->allowEscaping = false; - map->allowRunning = true; - map->floorNumber = 0; - map->battle_scene = mapBattleScenes.value(0, "MAP_BATTLE_SCENE_NORMAL"); -} - bool Project::loadLayout(MapLayout *layout) { // Force these to run even if one fails bool loadedTilesets = loadLayoutTilesets(layout);