From 74850a771249f25e01b7c4f6efee07b99e101c47 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 23 Oct 2006 18:28:46 +0000 Subject: [PATCH] (svn r6909) - Codechange: Base the decision to draw rail engine or wagon purchase information on the rail vehicle type, not an arbitrary value. --- vehicle_gui.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vehicle_gui.c b/vehicle_gui.c index b1b455b654..f171e84351 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -990,11 +990,11 @@ static void DrawEngineArrayInReplaceWindow(Window *w, int x, int y, int x2, int } } -static void DrawVehiclePurchaseInfo(const int x, const int y, const EngineID engine_number, const bool draw_locomotive) +static void DrawVehiclePurchaseInfo(const int x, const int y, const EngineID engine_number) { switch (GetEngine(engine_number)->type) { case VEH_Train: - if (draw_locomotive) { + if ((RailVehInfo(engine_number)->flags & RVI_WAGON) == 0) { DrawTrainEnginePurchaseInfo(x, y, engine_number); } else { DrawTrainWagonPurchaseInfo(x, y, engine_number); @@ -1090,7 +1090,7 @@ static void ReplaceVehicleWndProc(Window *w, WindowEvent *e) /* now we draw the info about the vehicles we selected */ for (i = 0 ; i < 2 ; i++) { if (selected_id[i] != INVALID_ENGINE) { - DrawVehiclePurchaseInfo((i == 1) ? 230 : 2 , 15 + (w->resize.step_height * w->vscroll.cap), selected_id[i], WP(w, replaceveh_d).wagon_btnstate); + DrawVehiclePurchaseInfo((i == 1) ? 230 : 2 , 15 + (w->resize.step_height * w->vscroll.cap), selected_id[i]); } } } break; // end of paint