From 5cd998b7a42ef7e6f57ac0fe5161f638d9fdf4f4 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 27 May 2009 19:37:27 +0000 Subject: [PATCH] (svn r16451) -Fix (r16449): crash when a spectator (or dedicated server) received news about new engine --- src/vehicle.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index e798f7b804..2d673e86cb 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1406,6 +1406,9 @@ static SpriteID GetEngineColourMap(EngineID engine_type, CompanyID company, Engi if (map == PAL_NONE) map = twocc ? (SpriteID)SPR_2CCMAP_BASE : (SpriteID)PALETTE_RECOLOUR_START; + /* Spectator has news shown too, but has invalid company ID - as well as dedicated server */ + if (!Company::IsValidID(company)) return map; + const Livery *livery = GetEngineLivery(engine_type, company, parent_engine_type, v); map += livery->colour1;