From aca5d1926aab2e190dda2b36511b72078b0490ef Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 10 Dec 2006 19:00:06 +0000 Subject: (svn r7473) -Fix (r7269): Pass a cargo type to determine the freight weight multiplier instead of a vehicle. Fixes incorrect display of total train capacity. --- train_gui.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'train_gui.c') diff --git a/train_gui.c b/train_gui.c index cc2f4609b..f3e461bbc 100644 --- a/train_gui.c +++ b/train_gui.c @@ -844,7 +844,7 @@ static void TrainDetailsCargoTab(const Vehicle *v, int x, int y) SetDParam(1, num); SetDParam(2, v->cargo_source); SetDParam(3, _patches.freight_trains); - str = FreightWagonMult(v) > 1 ? STR_FROM_MULT : STR_8813_FROM; + str = FreightWagonMult(v->cargo_type) > 1 ? STR_FROM_MULT : STR_8813_FROM; } DrawString(x, y, str, 0); } @@ -870,7 +870,7 @@ static void TrainDetailsCapacityTab(const Vehicle *v, int x, int y) SetDParam(0, v->cargo_type); SetDParam(1, v->cargo_cap); SetDParam(2, _patches.freight_trains); - DrawString(x, y, FreightWagonMult(v) > 1 ? STR_CAPACITY_MULT : STR_013F_CAPACITY, 0); + DrawString(x, y, FreightWagonMult(v->cargo_type) > 1 ? STR_CAPACITY_MULT : STR_013F_CAPACITY, 0); } } @@ -1008,7 +1008,7 @@ static void DrawTrainDetailsWindow(Window *w) SetDParam(2, i); // {SHORTCARGO} #1 SetDParam(3, max_cargo[i]); // {SHORTCARGO} #2 SetDParam(4, _patches.freight_trains); - DrawString(x, y + 2, FreightWagonMult(v) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_013F_TOTAL_CAPACITY, 0); + DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_013F_TOTAL_CAPACITY, 0); } } } -- cgit v1.2.3-54-g00ecf