diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-21 14:33:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-21 14:33:33 +0000 |
| commit | 5ef8c01ce7d7b554d678d5270baafb1146c80b57 (patch) | |
| tree | 4c1ef67d89a0fbc13b10c3ed8a9880350b14ab12 /src/articulated_vehicles.cpp | |
| parent | 22140d82c6efb1a6a03e1e4db0eca48766dce8ba (diff) | |
| download | openttd-5ef8c01ce7d7b554d678d5270baafb1146c80b57.tar.xz | |
(svn r12819) -Codechange: handle more NewGRFs in the same way as TTDP does it, i.e. testing the low bits for 0xFF or 0 instead of all bits.
Diffstat (limited to 'src/articulated_vehicles.cpp')
| -rw-r--r-- | src/articulated_vehicles.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 1f943b104..ef63e71b5 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -25,7 +25,7 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window) uint i; for (i = 1; i < MAX_UVALUE(EngineID); i++) { uint16 callback = GetVehicleCallback(CBID_VEHICLE_ARTIC_ENGINE, i, 0, engine_type, v); - if (callback == CALLBACK_FAILED || callback == 0xFF) break; + if (callback == CALLBACK_FAILED || GB(callback, 0, 8) == 0xFF) break; } delete v; @@ -52,7 +52,7 @@ uint16 *GetCapacityOfArticulatedParts(EngineID engine, VehicleType type) for (uint i = 1; i < MAX_UVALUE(EngineID); i++) { uint16 callback = GetVehicleCallback(CBID_VEHICLE_ARTIC_ENGINE, i, 0, engine, NULL); - if (callback == CALLBACK_FAILED || callback == 0xFF) break; + if (callback == CALLBACK_FAILED || GB(callback, 0, 8) == 0xFF) break; EngineID artic_engine = GetFirstEngineOfType(type) + GB(callback, 0, 7); @@ -78,7 +78,7 @@ void AddArticulatedParts(Vehicle **vl, VehicleType type) for (uint i = 1; i < MAX_UVALUE(EngineID); i++) { uint16 callback = GetVehicleCallback(CBID_VEHICLE_ARTIC_ENGINE, i, 0, v->engine_type, v); - if (callback == CALLBACK_FAILED || callback == 0xFF) return; + if (callback == CALLBACK_FAILED || GB(callback, 0, 8) == 0xFF) return; /* Attempt to use pre-allocated vehicles until they run out. This can happen * if the callback returns different values depending on the cargo type. */ |