From fccfada0b3e024ab0152417e910c715b66394005 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Fri, 27 Jan 2006 07:13:58 +0000 Subject: (svn r3449) - NewGRF Fix: When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf) --- newgrf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/newgrf.c b/newgrf.c index 695f6cb62..0adf1af72 100644 --- a/newgrf.c +++ b/newgrf.c @@ -272,6 +272,11 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf FOR_EACH_OBJECT { uint8 spriteid = grf_load_byte(&buf); + /* TTD sprite IDs point to a location in a 16bit array, but we use it + * as an array index, so we need it to be half the original value. */ + if (spriteid < 0xFD) + spriteid >>= 1; + rvi[i].image_index = spriteid; } } break; @@ -481,6 +486,9 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf if (spriteid == 0xFF) spriteid = 0xFD; // cars have different custom id in the GRF file + if (spriteid < 0xFD) + spriteid >>= 1; + rvi[i].image_index = spriteid; } } break; @@ -582,6 +590,9 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf if (spriteid == 0xFF) spriteid = 0xFD; // ships have different custom id in the GRF file + if (spriteid < 0xFD) + spriteid >>= 1; + svi[i].image_index = spriteid; } } break; @@ -699,6 +710,9 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte * if (spriteid == 0xFF) spriteid = 0xFD; // ships have different custom id in the GRF file + if (spriteid < 0xFD) + spriteid >>= 1; + avi[i].image_index = spriteid; } } break; -- cgit v1.2.3-70-g09d2