From 29d6bba669d1f44dad818d2f3933ccebf3f766fc Mon Sep 17 00:00:00 2001 From: expwnent Date: Sun, 2 Nov 2014 11:55:01 -0500 Subject: [PATCH] Fix trackstop ambiguity complaints, update df-structures. --- library/xml | 2 +- plugins/trackstop.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/xml b/library/xml index af94d10e9..d19695846 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit af94d10e9a3b17ea36b7e896bb950c6fc5369e31 +Subproject commit d19695846518a3cb62f35e70d49a5e9064e10af1 diff --git a/plugins/trackstop.cpp b/plugins/trackstop.cpp index 4676a1b52..c7109191a 100644 --- a/plugins/trackstop.cpp +++ b/plugins/trackstop.cpp @@ -48,7 +48,7 @@ struct trackstop_hook : public df::viewscreen_dwarfmodest { } building_trapst *ts = virtual_cast(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; } @@ -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_WHITE, x, y, ": Rolls ", false); OutputString(COLOR_WHITE, x, y, ( - (roller->direction == screw_pump_direction::FromNorth)? "Southward": - (roller->direction == screw_pump_direction::FromEast)? "Westward": - (roller->direction == screw_pump_direction::FromSouth)? "Northward": - (roller->direction == screw_pump_direction::FromWest)? "Eastward": + (roller->direction == df::screw_pump_direction::FromNorth)? "Southward": + (roller->direction == df::screw_pump_direction::FromEast)? "Westward": + (roller->direction == df::screw_pump_direction::FromSouth)? "Northward": + (roller->direction == df::screw_pump_direction::FromWest)? "Eastward": "" ), true, left_margin);