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

Fix metatile mask config loading

Browse source
This commit is contained in:
Marcus Huderle 2023-01-22 11:34:51 -06:00
parent 8ce6c2dfc9
commit 7d3699457f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config.h
View file

@ -36,7 +36,7 @@ protected:
virtual void setUnreadKeys() = 0; virtual void setUnreadKeys() = 0;
bool getConfigBool(QString key, QString value); bool getConfigBool(QString key, QString value);
int getConfigInteger(QString key, QString value, int min, int max, int defaultValue); int getConfigInteger(QString key, QString value, int min, int max, int defaultValue);
long getConfigLong(QString key, QString value, long min, long max, long defaultValue); uint32_t getConfigUint32(QString key, QString value, uint32_t min, uint32_t max, uint32_t defaultValue);
}; };
class PorymapConfig: public KeyValueConfigBase class PorymapConfig: public KeyValueConfigBase

12
src/config.cpp
View file

@ -153,9 +153,9 @@ int KeyValueConfigBase::getConfigInteger(QString key, QString value, int min, in
return qMin(max, qMax(min, result)); return qMin(max, qMax(min, result));
} }
long KeyValueConfigBase::getConfigLong(QString key, QString value, long min, long max, long defaultValue) { uint32_t KeyValueConfigBase::getConfigUint32(QString key, QString value, uint32_t min, uint32_t max, uint32_t defaultValue) {
bool ok; bool ok;
long result = value.toLong(&ok, 0); uint32_t result = value.toUInt(&ok, 0);
if (!ok) { if (!ok) {
logWarn(QString("Invalid config value for %1: '%2'. Must be an integer.").arg(key).arg(value)); logWarn(QString("Invalid config value for %1: '%2'. Must be an integer.").arg(key).arg(value));
return defaultValue; return defaultValue;
@ -579,13 +579,13 @@ void ProjectConfig::parseConfigKeyValue(QString key, QString value) {
} }
this->metatileAttributesSize = size; this->metatileAttributesSize = size;
} else if (key == "metatile_behavior_mask") { } else if (key == "metatile_behavior_mask") {
this->metatileBehaviorMask = getConfigLong(key, value, 0, 0xFFFFFFFF, 0); this->metatileBehaviorMask = getConfigUint32(key, value, 0, 0xFFFFFFFF, 0);
} else if (key == "metatile_terrain_type_mask") { } else if (key == "metatile_terrain_type_mask") {
this->metatileTerrainTypeMask = getConfigLong(key, value, 0, 0xFFFFFFFF, 0); this->metatileTerrainTypeMask = getConfigUint32(key, value, 0, 0xFFFFFFFF, 0);
} else if (key == "metatile_encounter_type_mask") { } else if (key == "metatile_encounter_type_mask") {
this->metatileEncounterTypeMask = getConfigLong(key, value, 0, 0xFFFFFFFF, 0); this->metatileEncounterTypeMask = getConfigUint32(key, value, 0, 0xFFFFFFFF, 0);
} else if (key == "metatile_layer_type_mask") { } else if (key == "metatile_layer_type_mask") {
this->metatileLayerTypeMask = getConfigLong(key, value, 0, 0xFFFFFFFF, 0); this->metatileLayerTypeMask = getConfigUint32(key, value, 0, 0xFFFFFFFF, 0);
} else if (key == "enable_map_allow_flags") { } else if (key == "enable_map_allow_flags") {
this->enableMapAllowFlags = getConfigBool(key, value); this->enableMapAllowFlags = getConfigBool(key, value);
#ifdef CONFIG_BACKWARDS_COMPATABILITY #ifdef CONFIG_BACKWARDS_COMPATABILITY