dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7473) -Fix (r7269): Pass a cargo type to determine the freight weight

Browse Source 
multiplier instead of a vehicle. Fixes incorrect display of total 
train capacity.
This commit is contained in:
peter1138
2006-12-10 19:00:06 +00:00
parent ea518f8d96
commit 8e26cfb157
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
train_gui.c
View File

@@ -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);
}
}
}