summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-04-13 19:32:18 +0000
committerpeter1138 <peter1138@openttd.org>2007-04-13 19:32:18 +0000
commit59399480b3af919eea479b1dd3e2ee69dcd0bc5a (patch)
tree78427100f591828f22b4bf1543e50769733875e1
parent39735f7b549d256e32b64ab837d15aaba6a82885 (diff)
downloadopenttd-59399480b3af919eea479b1dd3e2ee69dcd0bc5a.tar.xz
(svn r9620) -Codechange: apply cargo translation table to newstation variables 0x60..0x65
-rw-r--r--src/cargotype.cpp18
-rw-r--r--src/cargotype.h1
-rw-r--r--src/newgrf_cargo.cpp14
-rw-r--r--src/newgrf_cargo.h3
-rw-r--r--src/newgrf_station.cpp24
5 files changed, 54 insertions, 6 deletions
diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index bea8edd65..6d8a2ca63 100644
--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -71,3 +71,21 @@ CargoID GetCargoIDByLabel(CargoLabel cl)
/* No matching label was found, so it is invalid */
return CT_INVALID;
}
+
+
+/** Find the CargoID of a 'bitnum' value.
+ * @param bitnum 'bitnum' to find.
+ * @return First CargoID with the given bitnum, or CT_INVALID if not found.
+ */
+CargoID GetCargoIDByBitnum(uint8 bitnum)
+{
+ if (bitnum == INVALID_CARGO) return CT_INVALID;
+
+ for (CargoID c = 0; c < lengthof(_cargo); c++) {
+ if (_cargo[c].bitnum == bitnum) return c;
+ }
+
+ /* No matching label was found, so it is invalid */
+ return CT_INVALID;
+}
+
diff --git a/src/cargotype.h b/src/cargotype.h
index d74811c9a..347f09427 100644
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -58,6 +58,7 @@ void SetupCargoForClimate(LandscapeID l);
const CargoSpec *GetCargo(CargoID c);
/* Get the cargo ID with the cargo label */
CargoID GetCargoIDByLabel(CargoLabel cl);
+CargoID GetCargoIDByBitnum(uint8 bitnum);
static inline bool IsCargoInClass(CargoID c, uint16 cc)
{
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index c09cb10d2..788e2fbe5 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -94,3 +94,17 @@ uint16 GetCargoCallback(uint16 callback, uint32 param1, uint32 param2, const Car
return group->g.callback.result;
}
+
+
+CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile)
+{
+ /* Pre-version 7 uses the 'climate dependent' ID, i.e. cargo is the cargo ID */
+ if (grffile->grf_version < 7) return HASBIT(_cargo_mask, cargo) ? cargo : (CargoID) CT_INVALID;
+
+ /* If the GRF contains a translation table (and the cargo is in bounds)
+ * then get the cargo ID for the label */
+ if (cargo < grffile->cargo_max) return GetCargoIDByLabel(grffile->cargo_list[cargo]);
+
+ /* Else the cargo value is a 'climate independent' 'bitnum' */
+ return GetCargoIDByBitnum(cargo);
+}
diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h
index 1fd3b3d45..55df3729b 100644
--- a/src/newgrf_cargo.h
+++ b/src/newgrf_cargo.h
@@ -21,9 +21,12 @@ static const CargoID CT_DEFAULT = NUM_CARGO + 0;
static const CargoID CT_PURCHASE = NUM_CARGO + 1;
static const CargoID CT_DEFAULT_NA = NUM_CARGO + 2;
+/* Forward declarations of structs used */
struct CargoSpec;
+struct GRFFile;
SpriteID GetCustomCargoSprite(const CargoSpec *cs);
uint16 GetCargoCallback(uint16 callback, uint32 param1, uint32 param2, const CargoSpec *cs);
+CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile);
#endif /* NEWGRF_CARGO_H */
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index a799e3c57..eb9757f16 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -409,12 +409,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
case 0x49: return GetPlatformInfoHelper(tile, false, true, false);
/* Variables which use the parameter */
- case 0x60: return GB(st->goods[parameter].waiting_acceptance, 0, 12);
- case 0x61: return st->goods[parameter].days_since_pickup;
- case 0x62: return st->goods[parameter].rating;
- case 0x63: return st->goods[parameter].enroute_time;
- case 0x64: return st->goods[parameter].last_speed | (st->goods[parameter].last_age << 8);
- case 0x65: return GB(st->goods[parameter].waiting_acceptance, 12, 4);
+ /* Variables 0x60 to 0x65 are handled separately below */
/* General station properties */
case 0x82: return 50;
@@ -430,6 +425,23 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
case 0xFA: return max(st->build_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0);
}
+ /* Handle cargo variables with parameter, 0x60 to 0x65 */
+ if (variable >= 0x60 && variable <= 0x65) {
+ CargoID c = GetCargoTranslation(parameter, object->u.station.statspec->grffile);
+
+ if (c == CT_INVALID) return 0;
+ const GoodsEntry *ge = &st->goods[c];
+
+ switch (variable) {
+ case 0x60: return GB(ge->waiting_acceptance, 0, 12);
+ case 0x61: return ge->days_since_pickup;
+ case 0x62: return ge->rating;
+ case 0x63: return ge->enroute_time;
+ case 0x64: return ge->last_speed | (ge->last_age << 8);
+ case 0x65: return GB(ge->waiting_acceptance, 12, 4);
+ }
+ }
+
/* Handle cargo variables (deprecated) */
if (variable >= 0x8C && variable <= 0xEC) {
const GoodsEntry *g = &st->goods[GB(variable - 0x8C, 3, 4)];