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

Add new map to group that was selected (UI functionality only)

Browse Source
This commit is contained in:
Marcus Huderle
2018-02-14 20:33:55 -08:00
parent 794b814c47
commit 3fcad085c3
5 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
project.cpp
View File

@@ -8,15 +8,19 @@
#include <QDebug>
#include <QFile>
#include <QTextStream>
#include <QStandardItem>
#include <QMessageBox>
#include <QRegularExpression>
Project::Project()
{
groupNames = new QStringList;
map_groups = new QMap<QString, int>;
groupedMapNames = new QList<QStringList*>;
mapNames = new QStringList;
map_cache = new QMap<QString, Map*>;
mapConstantsToMapNames = new QMap<QString, QString>;
mapNamesToMapConstants = new QMap<QString, QString>;
tileset_cache = new QMap<QString, Tileset*>;
}
@@ -67,8 +71,8 @@ void Project::loadMapConnections(Map *map) {
connection->direction = command.value(1);
connection->offset = command.value(2);
QString mapConstant = command.value(3);
if (mapConstantsToMapNames.contains(mapConstant)) {
connection->map_name = mapConstantsToMapNames[mapConstant];
if (mapConstantsToMapNames->contains(mapConstant)) {
connection->map_name = mapConstantsToMapNames->value(mapConstant);
map->connections.append(connection);
} else {
qDebug() << QString("Failed to find connected map for map constant '%1'").arg(mapConstant);
@@ -521,11 +525,12 @@ void Project::readMapGroups() {
QStringList *list = groupedMaps->value(group);
list->append(mapName);
maps->append(mapName);
map_groups->insert(mapName, group);
// Build the mapping and reverse mapping between map constants and map names.
QString mapConstant = Map::mapConstantFromName(mapName);
mapConstantsToMapNames.insert(mapConstant, mapName);
mapNamesToMapConstants.insert(mapName, mapConstant);
mapConstantsToMapNames->insert(mapConstant, mapName);
mapNamesToMapConstants->insert(mapName, mapConstant);
}
}
}
@@ -536,6 +541,23 @@ void Project::readMapGroups() {
mapNames = maps;
}
void Project::addNewMapToGroup(QString mapName, int groupNum) {
mapNames->append(mapName);
map_groups->insert(mapName, groupNum);
groupedMapNames->value(groupNum)->append(mapName);
}
QString Project::getNewMapName() {
// Ensure default name doesn't already exist.
int i = 0;
QString newMapName;
do {
newMapName = QString("NewMap%1").arg(++i);
} while (mapNames->contains(newMapName));
return newMapName;
}
QList<QStringList>* Project::parse(QString text) {
Asm *parser = new Asm;
return parser->parse(text);
@@ -739,7 +761,7 @@ void Project::saveMapEvents(Map *map) {
text += QString(", %1").arg(warp->get("y"));
text += QString(", %1").arg(warp->get("elevation"));
text += QString(", %1").arg(warp->get("destination_warp"));
text += QString(", %1").arg(mapNamesToMapConstants[warp->get("destination_map_name")]);
text += QString(", %1").arg(mapNamesToMapConstants->value(warp->get("destination_map_name")));
text += "\n";
}
text += "\n";
@@ -882,8 +904,8 @@ void Project::readMapEvents(Map *map) {
// Ensure the warp destination map constant is valid before adding it to the warps.
QString mapConstant = command.value(i++);
if (mapConstantsToMapNames.contains(mapConstant)) {
warp->put("destination_map_name", mapConstantsToMapNames[mapConstant]);
if (mapConstantsToMapNames->contains(mapConstant)) {
warp->put("destination_map_name", mapConstantsToMapNames->value(mapConstant));
warp->put("event_type", "warp");
map->events["warp"].append(warp);
} else {