mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.

This commit is contained in:
peter1138 2006-10-24 07:10:37 +00:00
parent 735c636f6f
commit 736e3597b5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
train_gui.c
View File

@ -293,7 +293,7 @@ void DrawTrainEnginePurchaseInfo(int x, int y, uint w, EngineID engine_number)
/* Additional text from NewGRF */
y += ShowAdditionalText(x, y, w, engine_number);
y += ShowRefitOptionsList(x, y, w, engine_number);
if (rvi->capacity > 0) y += ShowRefitOptionsList(x, y, w, engine_number);
}
/**

6
vehicle_gui.c
View File

@ -210,6 +210,9 @@ static RefitList *BuildRefitList(const Vehicle *v)
uint32 cmask = EngInfo(u->engine_type)->refit_mask;
byte callbackmask = EngInfo(u->engine_type)->callbackmask;
/* Skip this engine if it has no capacity */
if (u->cargo_cap == 0) continue;
/* Loop through all cargos in the refit mask */
for (cid = 0; cmask != 0 && num_lines < max_lines; cmask >>= 1, cid++) {
CargoID lcid;
@ -274,8 +277,7 @@ static RefitList *BuildRefitList(const Vehicle *v)
}
}
}
u = u->next;
} while (v->type == VEH_Train && u != NULL && num_lines < max_lines);
} while (v->type == VEH_Train && (u = u->next) != NULL && num_lines < max_lines);
list->num_lines = num_lines;
list->items = refit;