Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 20:36:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix map connections.

Browse Source 
Since map constants can be inferred from map names, but not the other
way around, create a mapping between map constants and map names and use
that to find the connected map.
This commit is contained in:
Marcus Huderle
2018-02-12 08:42:01 -08:00
parent 0452156372
commit d7756865a9
4 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
project.cpp
View File

@@ -31,7 +31,7 @@ QString Project::getProjectTitle() {
Map* Project::loadMap(QString map_name) {
Map *map = new Map;
map->name = map_name;
map->setName(map_name);
readMapHeader(map);
readMapAttributes(map);
getTilesets(map);
@@ -66,8 +66,13 @@ void Project::loadMapConnections(Map *map) {
Connection *connection = new Connection;
connection->direction = command.value(1);
connection->offset = command.value(2);
connection->map_name = command.value(3);
map->connections.append(connection);
QString mapConstant = command.value(3);
if (mapConstantsToMapNames.contains(mapConstant)) {
connection->map_name = mapConstantsToMapNames[mapConstant];
map->connections.append(connection);
} else {
qDebug() << QString("Failed to find connected map for map constant '%1'").arg(mapConstant);
}
}
}
}
@@ -515,6 +520,10 @@ void Project::readMapGroups() {
QStringList *list = groupedMaps->value(group);
list->append(params.value(j));
maps->append(params.value(j));
// Build the mapping between map constants and map names.
QString mapConstant = Map::mapConstantFromName(params.value(j));
mapConstantsToMapNames.insert(mapConstant, params.value(j));
}
}
}