From 7aead21888223b1b40d3067a497e0f097c8b1df4 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 15 Aug 2020 11:32:50 +0100 Subject: [PATCH] Fix vehicle window mouse over colour when both stopped and waiting/stuck --- src/vehicle_gui.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 85dab38d0e..6e4da8ff5e 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -3355,8 +3355,11 @@ public: str = STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR; } else { // vehicle is in a "normal" state, show current order if (mouse_over_start_stop) { - if (v->vehstatus & VS_STOPPED) text_colour = TC_RED | TC_FORCED; - if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) text_colour = TC_ORANGE | TC_FORCED; + if (v->vehstatus & VS_STOPPED) { + text_colour = TC_RED | TC_FORCED; + } else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) { + text_colour = TC_ORANGE | TC_FORCED; + } } switch (v->current_order.GetType()) { case OT_GOTO_STATION: {