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

(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.

Browse Source
This commit is contained in:
peter1138
2007-02-24 23:36:40 +00:00
parent 29c8142784
commit 4c4b035175
9 changed files with 42 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vehicle_gui.cpp
View File

@@ -210,10 +210,8 @@ static RefitList *BuildRefitList(const Vehicle *v)
/* Loop through all cargos in the refit mask */
for (CargoID cid = 0; cid != NUM_CARGO && num_lines < max_lines; cid++) {
const CargoSpec *cs = GetCargo(cid);
/* Skip cargo type if it's not listed */
if (!HASBIT(cmask, cs->bitnum)) continue;
if (!HASBIT(cmask, cid)) continue;
/* Check the vehicle's callback mask for cargo suffixes */
if (HASBIT(callbackmask, CBM_CARGO_SUFFIX)) {
@@ -516,9 +514,7 @@ uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine)
/* Add each cargo type to the list */
for (CargoID cid = 0; cid < NUM_CARGO; cid++) {
const CargoSpec *cs = GetCargo(cid);
if (!HASBIT(cmask, cs->bitnum)) continue;
if (!HASBIT(cmask, cid)) continue;
if (!first) b = strecpy(b, ", ", lastof(_userstring));
first = false;