diff options
| author | maedhros <maedhros@openttd.org> | 2007-02-28 17:18:36 +0000 |
|---|---|---|
| committer | maedhros <maedhros@openttd.org> | 2007-02-28 17:18:36 +0000 |
| commit | 2f557f7dc0adf49a48e18d2f67af2c9bd3f3229e (patch) | |
| tree | 1d7abddc5b0568b06084eb248dba4886fdc92637 /src/vehicle.cpp | |
| parent | b9e079cff357760c2900a161e6490f87c411f408 (diff) | |
| download | openttd-2f557f7dc0adf49a48e18d2f67af2c9bd3f3229e.tar.xz | |
(svn r8945) -Codechange: Rename v->load_status to v->vehicle_flags so it can be used for more than just the gradual loading status.
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 09e889dac..bcca91fe3 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -718,7 +718,7 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v) if (v->cargo_cap == v->cargo_count) { full |= mask; } else if (GB(ge[v->cargo_type].waiting_acceptance, 0, 12) > 0 || - (HASBIT(v->load_status, LS_CARGO_UNLOADING) && (ge[v->cargo_type].waiting_acceptance & 0x8000))) { + (HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) && (ge[v->cargo_type].waiting_acceptance & 0x8000))) { /* If there is any cargo waiting, or this vehicle is still unloading * and the station accepts the cargo, don't leave the station. */ keep_loading = true; @@ -3049,7 +3049,7 @@ extern const SaveLoad _common_veh_desc[] = { SLE_VAR(Vehicle, load_unload_time_rem, SLE_UINT16), SLE_CONDVAR(Vehicle, cargo_paid_for, SLE_UINT16, 45, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, load_status, SLE_UINT8, 40, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, vehicle_flags, SLE_UINT8, 40, SL_MAX_VERSION), SLE_VAR(Vehicle, profit_this_year, SLE_INT32), SLE_VAR(Vehicle, profit_last_year, SLE_INT32), |