src/newgrf_engine.cpp
changeset 8599 35ed84aec9f4
parent 8556 ce8d86cc14d2
child 8614 4c67a883c4c4
--- a/src/newgrf_engine.cpp	Mon Feb 18 18:35:36 2008 +0000
+++ b/src/newgrf_engine.cpp	Mon Feb 18 19:20:37 2008 +0000
@@ -765,7 +765,11 @@
 	uint totalsets;
 	uint set;
 
-	if (v == NULL) return group->g.real.loading[0];
+	if (v == NULL) {
+		if (group->g.real.num_loading > 0) return group->g.real.loading[0];
+		if (group->g.real.num_loaded  > 0) return group->g.real.loaded[0];
+		return NULL;
+	}
 
 	bool in_motion = v->First()->current_order.type != OT_LOADING;