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

Fix trackstop ambiguity complaints, update df-structures.

develop
expwnent 2014-11-02 11:55:01 -05:00
parent ad96ba74ea
commit 29d6bba669
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit af94d10e9a3b17ea36b7e896bb950c6fc5369e31 Subproject commit d19695846518a3cb62f35e70d49a5e9064e10af1

10
plugins/trackstop.cpp
Unescape Escape View File

@ -48,7 +48,7 @@ struct trackstop_hook : public df::viewscreen_dwarfmodest {
} }
building_trapst *ts = virtual_cast<building_trapst>(world->selected_building); building_trapst *ts = virtual_cast<building_trapst>(world->selected_building);
if (ts && ts->trap_type == trap_type::TrackStop && ts->construction_stage) { if (ts && ts->trap_type == df::trap_type::TrackStop && ts->construction_stage) {
return ts; return ts;
} }
@ -239,10 +239,10 @@ struct roller_hook : public df::viewscreen_dwarfmodest {
OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_ORIENT_NONE)); OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(interface_key::BUILDING_ORIENT_NONE));
OutputString(COLOR_WHITE, x, y, ": Rolls ", false); OutputString(COLOR_WHITE, x, y, ": Rolls ", false);
OutputString(COLOR_WHITE, x, y, ( OutputString(COLOR_WHITE, x, y, (
(roller->direction == screw_pump_direction::FromNorth)? "Southward": (roller->direction == df::screw_pump_direction::FromNorth)? "Southward":
(roller->direction == screw_pump_direction::FromEast)? "Westward": (roller->direction == df::screw_pump_direction::FromEast)? "Westward":
(roller->direction == screw_pump_direction::FromSouth)? "Northward": (roller->direction == df::screw_pump_direction::FromSouth)? "Northward":
(roller->direction == screw_pump_direction::FromWest)? "Eastward": (roller->direction == df::screw_pump_direction::FromWest)? "Eastward":
"" ""
), true, left_margin); ), true, left_margin);