atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Minor fixes

Browse source
This commit is contained in:
GriffinR 2020-03-18 03:12:43 -04:00
parent 2a3b222e3e
commit 083874ce9e
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/metatileparser.cpp
View file

@ -84,6 +84,8 @@ QList<Metatile*> *MetatileParser::parse(QString filepath, bool *error, bool prim
(static_cast<unsigned char>(in.at(attrOffset + 1)) << 8); (static_cast<unsigned char>(in.at(attrOffset + 1)) << 8);
metatile->behavior = value & 0xFF; metatile->behavior = value & 0xFF;
metatile->layerType = (value & 0xF000) >> 12; metatile->layerType = (value & 0xF000) >> 12;
metatile->encounterType = 0;
metatile->terrainType = 0;
metatile->tiles = tiles; metatile->tiles = tiles;
metatiles->append(metatile); metatiles->append(metatile);
} }

2
src/mainwindow.cpp
View file

@ -164,6 +164,7 @@ void MainWindow::setProjectSpecificUIVisibility()
ui->label_AllowBiking->setVisible(false); ui->label_AllowBiking->setVisible(false);
ui->label_AllowEscapeRope->setVisible(false); ui->label_AllowEscapeRope->setVisible(false);
ui->label_FloorNumber->setVisible(false); ui->label_FloorNumber->setVisible(false);
ui->actionRegion_Map_Editor->setVisible(true);
break; break;
case BaseGameVersion::pokeemerald: case BaseGameVersion::pokeemerald:
ui->checkBox_AllowRunning->setVisible(true); ui->checkBox_AllowRunning->setVisible(true);
@ -174,6 +175,7 @@ void MainWindow::setProjectSpecificUIVisibility()
ui->label_AllowBiking->setVisible(true); ui->label_AllowBiking->setVisible(true);
ui->label_AllowEscapeRope->setVisible(true); ui->label_AllowEscapeRope->setVisible(true);
ui->label_FloorNumber->setVisible(false); ui->label_FloorNumber->setVisible(false);
ui->actionRegion_Map_Editor->setVisible(true);
break; break;
case BaseGameVersion::pokefirered: case BaseGameVersion::pokefirered:
ui->checkBox_AllowRunning->setVisible(true); ui->checkBox_AllowRunning->setVisible(true);

4
src/project.cpp
View file

@ -533,7 +533,7 @@ bool Project::readMapLayouts() {
layout->border_width = QString::number(bwidth); layout->border_width = QString::number(bwidth);
int bheight = layoutObj["border_height"].toInt(); int bheight = layoutObj["border_height"].toInt();
if (bheight <= 0) { if (bheight <= 0) {
logWarn(QString("Invalid layout 'border_height value '%1' on layout %2 in %3. Must be greater than 0. Using default (%4) instead.").arg(bheight).arg(i).arg(layoutsFilepath).arg(DEFAULT_BORDER_HEIGHT)); logWarn(QString("Invalid layout 'border_height' value '%1' on layout %2 in %3. Must be greater than 0. Using default (%4) instead.").arg(bheight).arg(i).arg(layoutsFilepath).arg(DEFAULT_BORDER_HEIGHT));
bheight = DEFAULT_BORDER_HEIGHT; bheight = DEFAULT_BORDER_HEIGHT;
} }
layout->border_height = QString::number(bheight); layout->border_height = QString::number(bheight);
@ -1221,7 +1221,9 @@ void Project::saveMap(Map *map) {
mapObj["allow_escaping"] = map->allowEscapeRope.toInt() > 0 || map->allowEscapeRope == "TRUE"; mapObj["allow_escaping"] = map->allowEscapeRope.toInt() > 0 || map->allowEscapeRope == "TRUE";
mapObj["allow_running"] = map->allowRunning.toInt() > 0 || map->allowRunning == "TRUE"; mapObj["allow_running"] = map->allowRunning.toInt() > 0 || map->allowRunning == "TRUE";
mapObj["show_map_name"] = map->show_location.toInt() > 0 || map->show_location == "TRUE"; mapObj["show_map_name"] = map->show_location.toInt() > 0 || map->show_location == "TRUE";
if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) {
mapObj["floor_number"] = map->floorNumber; mapObj["floor_number"] = map->floorNumber;
}
mapObj["battle_scene"] = map->battle_scene; mapObj["battle_scene"] = map->battle_scene;
// Connections // Connections