# HG changeset patch # User rubidium # Date 1207439161 0 # Node ID bdaf8866039c030a793468feda1bf98216ea4c4d # Parent 890a7731580167ec01454570c5adb7e01c29ce39 (svn r12585) -Fix (r12584): assumption that assertions were enabled during compilation/testing was flawed. diff --git a/src/economy.cpp b/src/economy.cpp --- 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) { diff --git a/src/vehicle.cpp b/src/vehicle.cpp --- 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);