Mercurial > hg > openttd

changeset 9062:d776849d7648 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r12914) -Fix: Game crash when a spectator/server tried to show an engine with no owner when a NewGRF requested a specific variable.
author peter1138 <peter1138@openttd.org>
date Mon, 28 Apr 2008 11:15:13 +0000
parents 888b60158039
children 124b8112e37a
files src/newgrf_engine.cpp
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -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);