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

Fix reading map obj gfx constants

Browse source
This commit is contained in:
Marcus Huderle 2018-02-11 19:20:29 -08:00
parent 26d4f234aa
commit 07fa705b03
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
project.cpp
View file

@ -609,20 +609,11 @@ QString Project::getSongName(int songNumber) {
QMap<QString, int> Project::getMapObjGfxConstants() {
QMap<QString, int> constants;
QString text = readTextFile(root + "/constants/map_object_constants.inc");
QString text = readTextFile(root + "/include/constants/map_objects.h");
if (!text.isNull()) {
QList<QStringList> *commands = parse(text);
for (int i = 0; i < commands->length(); i++) {
QStringList params = commands->value(i);
QString macro = params.value(0);
if (macro == ".set") {
QString constant = params.value(1);
if (constant.startsWith("MAP_OBJ_GFX_")) {
int value = params.value(2).toInt(nullptr, 0);
constants.insert(constant, value);
}
}
}
QStringList mapObjGfxPrefixes;
mapObjGfxPrefixes << "MAP_OBJ_GFX_";
constants = readCDefines(text, mapObjGfxPrefixes);
}
return constants;
}