summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-05 23:46:01 +0000
committerrubidium <rubidium@openttd.org>2008-04-05 23:46:01 +0000
commit630d5ad766c8632e9b47aed2de97b4996c9fa216 (patch)
tree1331cafe5b467c7ca22f1040e5e65f6724e81619
parent5b47f81b0f6d46a876a24c0384791af123ac4ab7 (diff)
downloadopenttd-630d5ad766c8632e9b47aed2de97b4996c9fa216.tar.xz
(svn r12585) -Fix (r12584): assumption that assertions were enabled during compilation/testing was flawed.
-rw-r--r--src/economy.cpp2
-rw-r--r--src/vehicle.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index 79283e664..329fdcbc3 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1552,7 +1552,7 @@ void VehiclePayment(Vehicle *front_v)
*/
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
index 15c7c1007..c81baf4b6 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -3164,7 +3164,7 @@ void Vehicle::BeginLoading()
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);