diff --git a/include/mainwindow.h b/include/mainwindow.h index 6e124f8d..89319d0e 100644 --- a/include/mainwindow.h +++ b/include/mainwindow.h @@ -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, int tileId, bool xflip, bool yflip, int palette, int tileStart = 0, int tileEnd = -1, bool forceRedraw = true); Q_INVOKABLE QJSValue getTilePixels(int tileId); - bool gameStringToBool(QString s); Q_INVOKABLE QString getSong(); Q_INVOKABLE void setSong(QString song); Q_INVOKABLE QString getLocation(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f5ab0d03..d930ed77 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -792,9 +792,11 @@ void MainWindow::displayMapProperties() { ui->comboBox_Type->setCurrentText(map->type); ui->comboBox_BattleScene->setCurrentText(map->battle_scene); ui->checkBox_ShowLocation->setChecked(ParseUtil::gameStringToBool(map->show_location)); - ui->checkBox_AllowRunning->setChecked(ParseUtil::gameStringToBool(map->allowRunning)); - ui->checkBox_AllowBiking->setChecked(ParseUtil::gameStringToBool(map->allowBiking)); - ui->checkBox_AllowEscapeRope->setChecked(ParseUtil::gameStringToBool(map->allowEscapeRope)); + if (projectConfig.getBaseGameVersion() != BaseGameVersion::pokeruby) { + ui->checkBox_AllowRunning->setChecked(ParseUtil::gameStringToBool(map->allowRunning)); + ui->checkBox_AllowBiking->setChecked(ParseUtil::gameStringToBool(map->allowBiking)); + ui->checkBox_AllowEscapeRope->setChecked(ParseUtil::gameStringToBool(map->allowEscapeRope)); + } ui->spinBox_FloorNumber->setValue(map->floorNumber); // Custom fields table.