Mercurial > hg > openttd
changeset 8837:bdaf8866039c draft
(svn r12585) -Fix (r12584): assumption that assertions were enabled during compilation/testing was flawed.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sat, 05 Apr 2008 23:46:01 +0000 |
| parents | 890a77315801 |
| children | db9c6b0c9f07 |
| files | src/economy.cpp src/vehicle.cpp |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -1552,7 +1552,7 @@ */ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) { - assert(v->current_order.type == OT_LOADING); + assert(v->current_order.IsType(OT_LOADING)); /* We have not waited enough time till the next round of loading/unloading */ if (--v->load_unload_time_rem != 0) {
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -3164,7 +3164,7 @@ void Vehicle::LeaveStation() { - assert(current_order.type == OT_LOADING); + assert(current_order.IsType(OT_LOADING)); /* Only update the timetable if the vehicle was supposed to stop here. */ if (current_order.flags & OFB_NON_STOP) UpdateVehicleTimetable(this, false);