From 741fc265225e879d77515d14f056c8969f6fde82 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 1 Mar 2006 23:14:03 +0000 Subject: [PATCH] (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. --- data/2ccmap.grf | Bin 0 -> 66566 bytes engine.h | 9 +++++++++ gfxinit.c | 3 +++ table/sprites.h | 5 +++-- vehicle.c | 16 +++++++++++----- 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 data/2ccmap.grf diff --git a/data/2ccmap.grf b/data/2ccmap.grf new file mode 100644 index 0000000000000000000000000000000000000000..4e833c0e885423f7542f4635e75182babb137e30 GIT binary patch literal 66566 zcmd_wb(fGu97pk8#RA1{5wO5c5CsLh^&I0IY-|M!0~8el6uTR2!2r8Eu)DAWy8snM zR77-v?+fssx%V*p24?p&&oj?&?%Br1DGd#cGtJy=mRV<;eU9cW=A5hL-1E#k-~0 zXRm_~IrOl@dmnM+QAhXbd(5%@jywK@{wJPv@+kubo_gA#)6Y2bth3KK_q_8jxbUKj zFS+!x%dfa{@Q|ynzUJENuD{{Np~G&v`IcLUkGSpjJMO&e?tAXN@BRlKeCXjv9)0Zb zC!T!j>54KZW`iEnzr-~gWTvRuAahsE2AMW%Hprx1vq86M*M@dA8+7P6?PgcALHC|*+P0t2 zyhY6hO@DvW&EH{=TWrn!fHBCbH9rTgevln0`!2Zp0b}6m2aJKMA20^4e!v*G`T=9$ z>IaO0s~<21u71E6xcUKO;OYmAfvX=d2Cja<7`XaDZg6GqOs@YwU<~r~Ir;%(kX36o zaP@=iNZIqi)ejg0S3h73T>XGCaPv(*#=zAN7z0;7U<_RS zfH83OgWO)q-WOc`fH83O1I8e4prao!23fUc16M!Dj+8wUUHyPDaPv(*#=zAN7z0;7U<_RSfH83O1IEDB4>Gxzot0hvfH83O1IEDB4;X`-LXLjG z7-ZF&4P5;oJ5u($;OYmAfvX=d2Cja<7`XZYW8mrsjDf2kFb1xEz!v(* z#=zAN7z0;7U<_RSfH83O1IEDB4;TYiKgh&Zc1Cjb1IEDB4;TYiKVS@8{eUrW^#jHr zUn569U<|Tq%?7T1kR2&IAGrDfW8mrsjDf2kFb1xEz!IaO0s~<21`64^|0b`I=Yc_E8gX~Dz8OhZT7z0;7 zU<_RSfH83O1IEDB4;TYiKVS@8{UBfJvfoBmKVS@8{eUrW^#jJh)ejg0S3h73T>XGC zaPA20@4wPpiXKgf=hofBRCfH83O1IEDB4;TYiKVS@8{eUrW^@Dt+%6=DI z{eUrW^#jJh)ejg0S3h73T>XGCaPXGCaPIaO0s~_ZaDtjKd`T=9$ z>IaO0s~<21u71E6xcUKO;OYmAfvX=d2Cja<7`XZYW8mrsj6o)JM?YW;vTDr+u6~dm zDSKyf^#jJh)ejg0S3k&`S@vCU^#jJh)ejg0S3h73T>XGCaPv(*#=zAN7z0;7U<`6gar6VmAgk7F;OYn2k+SzjS3h73T>T(VW!dMz)ejg0S3h73 zT>XGCaPv(*#=zAN7z0;7U<_RSfH83O1I8dXHAg>S46XGCaPv(*#=zAN7z0;7U<`6wb@T(qAgk7F;OYnYZEEfZjDf2kFb1xEz!IaO0s~<21u71E6xcUKO;OYmAfvX=d2Cja<7-ZG|-%uK+ G{`?ELkjw)B literal 0 HcmV?d00001 diff --git a/engine.h b/engine.h index 637e9f6494..14e21f311a 100644 --- a/engine.h +++ b/engine.h @@ -98,6 +98,15 @@ typedef struct Engine { byte type; // type, ie VEH_Road, VEH_Train, etc. Same as in vehicle.h } Engine; +/** + * EngineInfo.misc_flags is a bitmask, with the following values + */ +enum { + EF_RAIL_TILTS = 0, ///< Rail vehicle tilts in curves (unsupported) + EF_ROAD_TRAM = 0, ///< Road vehicle is a tram/light rail vehicle (unsup) + EF_USES_2CC = 1, ///< Vehicle uses two company colours + EF_RAIL_IS_MU = 2, ///< Rail vehicle is a multiple-unit (DMU/EMU) +}; enum { RVI_MULTIHEAD = 1, diff --git a/gfxinit.c b/gfxinit.c index 9977536f08..e60a5308ab 100644 --- a/gfxinit.c +++ b/gfxinit.c @@ -352,6 +352,9 @@ static void LoadSpriteTables(void) load_index = SPR_AUTORAIL_BASE; load_index += LoadGrfFile("autorail.grf", load_index, i++); + assert(load_index == SPR_2CCMAP_BASE); + load_index += LoadGrfFile("2ccmap.grf", load_index, i++); + assert(load_index == SPR_OPENTTD_BASE); LoadGrfIndexed("openttd.grf", _openttd_grf_indexes, i++); load_index = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT; diff --git a/table/sprites.h b/table/sprites.h index c29ffddf19..54ef424ee8 100644 --- a/table/sprites.h +++ b/table/sprites.h @@ -51,7 +51,8 @@ enum Sprites { SPR_CANALS_BASE = 5382, SPR_SLOPES_BASE = SPR_CANALS_BASE + 70, SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78, - SPR_OPENTTD_BASE = SPR_AUTORAIL_BASE + 55, + SPR_2CCMAP_BASE = SPR_AUTORAIL_BASE + 55, + SPR_OPENTTD_BASE = SPR_2CCMAP_BASE + 256, SPR_BLOT = SPR_OPENTTD_BASE + 29, // colored circle (mainly used as vehicle profit marker and for sever compatibility) @@ -1071,7 +1072,7 @@ enum SpriteSetup { TRANSPARENT_BIT = 31, ///< toggles transparency in the sprite RECOLOR_BIT = 15, ///< toggles recoloring in the sprite PALETTE_SPRITE_START = 16, ///< number of the first bit of the sprite containing the recolor palette - PALETTE_SPRITE_WIDTH = 11, ///< number of bits of the sprite containing the recolor palette + PALETTE_SPRITE_WIDTH = 14, ///< number of bits of the sprite containing the recolor palette SPRITE_WIDTH = 14, ///< number of bits for the sprite number }; diff --git a/vehicle.c b/vehicle.c index fa8ba98936..0074a03551 100644 --- a/vehicle.c +++ b/vehicle.c @@ -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