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

Ignore unused map header fields for pokeruby

Browse source
This commit is contained in:
GriffinR 2022-10-08 14:11:33 -04:00 committed by Marcus Huderle
parent c58162be96
commit d7894f8399
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mainwindow.h
View file

@ -129,7 +129,6 @@ public:
Q_INVOKABLE void setMetatileTiles(int metatileId, QJSValue tilesObj, int tileStart = 0, int tileEnd = -1, bool forceRedraw = true); Q_INVOKABLE void setMetatileTiles(int metatileId, QJSValue tilesObj, int tileStart = 0, int tileEnd = -1, bool forceRedraw = true);
Q_INVOKABLE void setMetatileTiles(int metatileId, int tileId, bool xflip, bool yflip, int palette, int tileStart = 0, int tileEnd = -1, bool forceRedraw = true); Q_INVOKABLE void setMetatileTiles(int metatileId, int tileId, bool xflip, bool yflip, int palette, int tileStart = 0, int tileEnd = -1, bool forceRedraw = true);
Q_INVOKABLE QJSValue getTilePixels(int tileId); Q_INVOKABLE QJSValue getTilePixels(int tileId);
bool gameStringToBool(QString s);
Q_INVOKABLE QString getSong(); Q_INVOKABLE QString getSong();
Q_INVOKABLE void setSong(QString song); Q_INVOKABLE void setSong(QString song);
Q_INVOKABLE QString getLocation(); Q_INVOKABLE QString getLocation();

8
src/mainwindow.cpp
View file

@ -792,9 +792,11 @@ void MainWindow::displayMapProperties() {
ui->comboBox_Type->setCurrentText(map->type); ui->comboBox_Type->setCurrentText(map->type);
ui->comboBox_BattleScene->setCurrentText(map->battle_scene); ui->comboBox_BattleScene->setCurrentText(map->battle_scene);
ui->checkBox_ShowLocation->setChecked(ParseUtil::gameStringToBool(map->show_location)); ui->checkBox_ShowLocation->setChecked(ParseUtil::gameStringToBool(map->show_location));
ui->checkBox_AllowRunning->setChecked(ParseUtil::gameStringToBool(map->allowRunning)); if (projectConfig.getBaseGameVersion() != BaseGameVersion::pokeruby) {
ui->checkBox_AllowBiking->setChecked(ParseUtil::gameStringToBool(map->allowBiking)); ui->checkBox_AllowRunning->setChecked(ParseUtil::gameStringToBool(map->allowRunning));
ui->checkBox_AllowEscapeRope->setChecked(ParseUtil::gameStringToBool(map->allowEscapeRope)); ui->checkBox_AllowBiking->setChecked(ParseUtil::gameStringToBool(map->allowBiking));
ui->checkBox_AllowEscapeRope->setChecked(ParseUtil::gameStringToBool(map->allowEscapeRope));
}
ui->spinBox_FloorNumber->setValue(map->floorNumber); ui->spinBox_FloorNumber->setValue(map->floorNumber);
// Custom fields table. // Custom fields table.