diff -r a85bab77cbdd -r 4240f624bca0 roadveh_cmd.c
--- a/roadveh_cmd.c	Sat Dec 11 09:51:55 2004 +0000
+++ b/roadveh_cmd.c	Sat Dec 11 10:17:10 2004 +0000
@@ -569,7 +569,7 @@
 
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) &&
-			SERVICE_INTERVAL ) {
+			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
 	}
 
@@ -1433,7 +1433,7 @@
 	if (_patches.servint_roadveh == 0)
 		return;
 
-	if (SERVICE_INTERVAL)
+	if (!VehicleNeedsService(v))
 		return;
 
 	if (v->vehstatus & VS_STOPPED)