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

5
src/vehicle_gui.cpp
View File

@@ -209,7 +209,7 @@ static RefitList *BuildRefitList(const Vehicle *v)
if (u->cargo_cap == 0) continue;
/* Loop through all cargos in the refit mask */
for (CargoID cid = 0; cid != NUM_CARGO && num_lines < max_lines; cid++) {
for (CargoID cid = 0; cid < NUM_CARGO && num_lines < max_lines; cid++) {
/* Skip cargo type if it's not listed */
if (!HASBIT(cmask, cid)) continue;
@@ -616,14 +616,13 @@ static int CDECL VehicleCargoSorter(const void *a, const void *b)
AcceptedCargo cargoa;
AcceptedCargo cargob;
int r = 0;
int i;
memset(cargoa, 0, sizeof(cargoa));
memset(cargob, 0, sizeof(cargob));
for (v = va; v != NULL; v = v->next) cargoa[v->cargo_type] += v->cargo_cap;
for (v = vb; v != NULL; v = v->next) cargob[v->cargo_type] += v->cargo_cap;
for (i = 0; i < NUM_CARGO; i++) {
for (CargoID i = 0; i < NUM_CARGO; i++) {
r = cargoa[i] - cargob[i];
if (r != 0) break;
}