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

(svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops.

Browse Source
This commit is contained in:
peter1138
2007-03-21 13:19:01 +00:00
parent 7e00fdac90
commit 93fe91cc8c
13 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_gui.cpp
View File

@@ -371,7 +371,6 @@ static void DrawTrainDetailsWindow(Window *w)
const Vehicle *u;
AcceptedCargo act_cargo;
AcceptedCargo max_cargo;
uint i;
int num;
int x;
int y;
@@ -380,7 +379,7 @@ static void DrawTrainDetailsWindow(Window *w)
num = 0;
u = v = GetVehicle(w->window_number);
if (det_tab == 3) { // Total cargo tab
for (i = 0; i < lengthof(act_cargo); i++) {
for (CargoID i = 0; i < lengthof(act_cargo); i++) {
act_cargo[i] = 0;
max_cargo[i] = 0;
}
@@ -393,7 +392,7 @@ static void DrawTrainDetailsWindow(Window *w)
/* Set scroll-amount seperately from counting, as to not compute num double
* for more carriages of the same type
*/
for (i = 0; i != NUM_CARGO; i++) {
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (max_cargo[i] > 0) num++; // only count carriages that the train has
}
num++; // needs one more because first line is description string
@@ -492,7 +491,7 @@ static void DrawTrainDetailsWindow(Window *w)
} else {
// draw total cargo tab
DrawString(x, y + 2, STR_013F_TOTAL_CAPACITY_TEXT, 0);
for (i = 0; i != NUM_CARGO; i++) {
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (max_cargo[i] > 0 && --sel < 0 && sel > -w->vscroll.cap) {
y += 14;
SetDParam(0, i); // {CARGO} #1