MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarfmonitor prefs: fix segfault if item_subtype is null for some item types

develop
lethosor 2020-10-11 20:45:56 -04:00
parent b343d00800
commit 93520b4b00
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.txt
Unescape Escape View File

@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
# Future
## Fixes
- `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
# 0.47.04-r3
## New Plugins

85
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -1155,52 +1155,107 @@ struct preference_map
string getItemLabel()
{
df::world_raws::T_itemdefs &defs = world->raws.itemdefs;
label = ENUM_ATTR_STR(item_type, caption, pref.item_type);
switch (pref.item_type)
{
case (df::item_type::WEAPON):
label = defs.weapons[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.weapons, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::TRAPCOMP):
label = defs.trapcomps[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.trapcomps, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::TOY):
label = defs.toys[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.toys, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::TOOL):
label = defs.tools[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.tools, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::INSTRUMENT):
label = defs.instruments[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.instruments, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::ARMOR):
label = defs.armor[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.armor, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::AMMO):
label = defs.ammo[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.ammo, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::SIEGEAMMO):
label = defs.siege_ammo[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.siege_ammo, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::GLOVES):
label = defs.gloves[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.gloves, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::SHOES):
label = defs.shoes[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.shoes, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::SHIELD):
label = defs.shields[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.shields, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::HELM):
label = defs.helms[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.helms, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::PANTS):
label = defs.pants[pref.item_subtype]->name_plural;
{
auto *def = vector_get(world->raws.itemdefs.pants, pref.item_subtype);
if (def)
label = def->name_plural;
break;
}
case (df::item_type::FOOD):
label = defs.food[pref.item_subtype]->name;
{
auto *def = vector_get(world->raws.itemdefs.food, pref.item_subtype);
if (def)
label = def->name;
break;
}
default:
label = ENUM_ATTR_STR(item_type, caption, pref.item_type);