dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour.

Browse Source
This commit is contained in:
peter1138
2006-03-01 23:14:03 +00:00
parent e8cf6ec8fd
commit 058ccfb157
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vehicle.c
View File

@@ -2040,20 +2040,26 @@ UnitID GetFreeUnitNumber(byte type)
return unit;
}
// XXX Temporary stub -- will be expanded
static PalSpriteID GetEngineColourMap(PlayerID player)
static PalSpriteID GetEngineColourMap(EngineID engine_type, PlayerID player)
{
return SPRITE_PALETTE(PLAYER_SPRITE_COLOR(player));
SpriteID map;
byte colour = _player_colors[player];
/* XXX Magic 0x307 is the first company colour remap sprite */
map = HASBIT(_engine_info[engine_type].misc_flags, EF_USES_2CC) ?
(SPR_2CCMAP_BASE + colour + colour * 16) : (0x307 + colour);
return SPRITE_PALETTE(map << PALETTE_SPRITE_START);
}
PalSpriteID GetEnginePalette(EngineID engine_type, PlayerID player)
{
return GetEngineColourMap(player);
return GetEngineColourMap(engine_type, player);
}
PalSpriteID GetVehiclePalette(const Vehicle *v)
{
return GetEngineColourMap(v->owner);
return GetEngineColourMap(v->engine_type, v->owner);
}
// Save and load of vehicles