(svn r12914) -Fix: Game crash when a spectator/server tried to show an engine with no owner when a NewGRF requested a specific variable.
authorpeter1138
Mon, 28 Apr 2008 11:15:13 +0000
changeset 10373 899ed5c4ce9b
parent 10372 93844492fdd9
child 10374 89357fea3428
(svn r12914) -Fix: Game crash when a spectator/server tried to show an engine with no owner when a NewGRF requested a specific variable.
src/newgrf_engine.cpp
--- a/src/newgrf_engine.cpp	Sun Apr 27 20:09:29 2008 +0000
+++ b/src/newgrf_engine.cpp	Mon Apr 28 11:15:13 2008 +0000
@@ -478,6 +478,7 @@
 	const Livery *l;
 
 	if (v == NULL) {
+		if (!IsValidPlayer(_current_player)) return 0;
 		l = GetEngineLivery(engine, _current_player, INVALID_ENGINE, NULL);
 	} else if (v->type == VEH_TRAIN) {
 		l = GetEngineLivery((v->u.rail.first_engine != INVALID_ENGINE && (IsArticulatedPart(v) || UsesWagonOverride(v))) ? v->u.rail.first_engine : v->engine_type, v->owner, v->u.rail.first_engine, v);