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

(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.

Browse Source
This commit is contained in:
peter1138
2007-02-22 22:09:51 +00:00
parent 11f286fb74
commit 2306a02f75
12 changed files with 75 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_station.cpp
View File

@@ -18,6 +18,7 @@
#include "newgrf_spritegroup.h"
#include "date.h"
#include "helpers.hpp"
#include "cargotype.h"
static StationClass station_classes[STAT_CLASS_MAX];
@@ -459,7 +460,7 @@ static const SpriteGroup *StationResolveReal(const ResolverObject *object, const
break;
default:
cargo = GB(st->goods[_local_cargo_id_ctype[cargo_type]].waiting_acceptance, 0, 12);
cargo = GB(st->goods[GetCargoIDByBitnum(cargo_type)].waiting_acceptance, 0, 12);
break;
}
@@ -511,15 +512,12 @@ static const SpriteGroup *ResolveStation(ResolverObject *object)
/* No station, so we are in a purchase list */
ctype = GC_PURCHASE;
} else {
CargoID cargo;
/* Pick the first cargo that we have waiting */
for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) {
CargoID lcid = _local_cargo_id_ctype[cargo];
if (lcid != CT_INVALID &&
object->u.station.statspec->spritegroup[cargo] != NULL &&
GB(object->u.station.st->goods[lcid].waiting_acceptance, 0, 12) != 0) {
ctype = cargo;
for (CargoID cargo = 0; cargo < NUM_CARGO; cargo++) {
const CargoSpec *cs = GetCargo(cargo);
if (cs->bitnum != 0xFF && object->u.station.statspec->spritegroup[cs->bitnum] != NULL &&
GB(object->u.station.st->goods[cargo].waiting_acceptance, 0, 12) != 0) {
ctype = cs->bitnum;
break;
}
}