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

Use VIRTUAL_CAST_VAR correctly.

develop
JapaMala 2018-12-26 01:10:51 -06:00
parent 84578d7052
commit 368d70c2d7
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/remotefortressreader/item_reader.cpp
Unescape Escape View File

@ -674,8 +674,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::ARMOR: case df::enums::item_type::ARMOR:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_armorst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_armorst, item))
if (armor)
{ {
mat_def->set_up_step(armor->ubstep); mat_def->set_up_step(armor->ubstep);
mat_def->set_down_step(armor->lbstep); mat_def->set_down_step(armor->lbstep);
@ -685,8 +684,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::SHOES: case df::enums::item_type::SHOES:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_shoesst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_shoesst, item))
if (armor)
{ {
mat_def->set_up_step(armor->upstep); mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000); mat_def->set_down_step(10000);
@ -696,8 +694,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::SHIELD: case df::enums::item_type::SHIELD:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_shieldst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_shieldst, item))
if (armor)
{ {
mat_def->set_up_step(armor->upstep); mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000); mat_def->set_down_step(10000);
@ -706,8 +703,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::HELM: case df::enums::item_type::HELM:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_helmst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_helmst, item))
if (armor)
{ {
mat_def->set_layer((ArmorLayer)armor->props.layer); mat_def->set_layer((ArmorLayer)armor->props.layer);
} }
@ -715,8 +711,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::GLOVES: case df::enums::item_type::GLOVES:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_glovesst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_glovesst, item))
if (armor)
{ {
mat_def->set_up_step(armor->upstep); mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000); mat_def->set_down_step(10000);
@ -726,8 +721,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
break; break;
case df::enums::item_type::PANTS: case df::enums::item_type::PANTS:
{ {
VIRTUAL_CAST_VAR(armor, df::itemdef_pantsst, item); if (VIRTUAL_CAST_VAR(armor, df::itemdef_pantsst, item))
if (armor)
{ {
mat_def->set_down_step(armor->lbstep); mat_def->set_down_step(armor->lbstep);
mat_def->set_layer((ArmorLayer)armor->props.layer); mat_def->set_layer((ArmorLayer)armor->props.layer);