diff options
author | peter1138 <peter1138@openttd.org> | 2008-04-28 11:15:13 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2008-04-28 11:15:13 +0000 |
commit | 1a7c1cb84bae4a138ecbaaf477667e293f942300 (patch) | |
tree | b6004e6dabaff2450d1b81250c3278198fa76db5 /src | |
parent | 783e20a263a5e72bfed81ef7a9535a2caefebf79 (diff) | |
download | openttd-1a7c1cb84bae4a138ecbaaf477667e293f942300.tar.xz |
(svn r12914) -Fix: Game crash when a spectator/server tried to show an engine with no owner when a NewGRF requested a specific variable.
Diffstat (limited to 'src')
-rw-r--r-- | src/newgrf_engine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index b7a83663e..7309e7cfc 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -478,6 +478,7 @@ static uint8 LiveryHelper(EngineID engine, const Vehicle *v) 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); |