mirror of https://github.com/OpenTTD/OpenTTD
(svn r3447) - CodeChange: [ 1360866 ] station_land.h Naming ALL sprites. Also replaced the SPTR_STATUE_GROUND by the more obvious SPR_CONCRETE_GROUND in unmovable_cmd.c. No functional changes except for commenting out PALETTE_RECOLOR_SPRITE in table/sprites.h. (Belugas)
Darkvater
parent
6fb36934a8
commit
1a2fac805c
|
|
@ -51,7 +51,7 @@ 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_OPENTTD_BASE = SPR_AUTORAIL_BASE + 55, // can be lowered once autorail.grf is finalized
|
||||
|
||||
SPR_BLOT = SPR_OPENTTD_BASE + 29, // colored circle (mainly used as vehicle profit marker and for sever compatibility)
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ enum Sprites {
|
|||
SPR_HUGEHQ_WEST_GROUND = 2629,
|
||||
SPR_HUGEHQ_WEST_BUILD = 2630,
|
||||
SPR_HUGEHQ_SOUTH = 2631,
|
||||
SPR_STATUE_GROUND = 1420,
|
||||
SPR_CONCRETE_GROUND = 1420,
|
||||
SPR_STATUE_COMPANY = 2632,
|
||||
SPR_BOUGHT_LAND = 4790,
|
||||
|
||||
|
|
@ -270,8 +270,7 @@ enum Sprites {
|
|||
|
||||
/* Road Stops */
|
||||
/* Road stops have a ground tile and 3 buildings, one on each side
|
||||
(except the side where the entry is). These are marked _A _B and _C
|
||||
*/
|
||||
* (except the side where the entry is). These are marked _A _B and _C */
|
||||
SPR_BUS_STOP_NE_GROUND = 2692,
|
||||
SPR_BUS_STOP_SE_GROUND = 2693,
|
||||
SPR_BUS_STOP_SW_GROUND = 2694,
|
||||
|
|
@ -580,8 +579,7 @@ enum Sprites {
|
|||
|
||||
/* cantilever bridges */
|
||||
/* They have three different kinds of tiles:
|
||||
END(ing), MID(dle), BEG(gining)
|
||||
*/
|
||||
* END(ing), MID(dle), BEG(gining) */
|
||||
SPR_BTCAN_RAIL_X_BEG = 2507,
|
||||
SPR_BTCAN_RAIL_X_MID = 2508,
|
||||
SPR_BTCAN_RAIL_X_END = 2509,
|
||||
|
|
@ -709,6 +707,61 @@ enum Sprites {
|
|||
/* Town/house sprites */
|
||||
SPR_LIFT = 1443,
|
||||
|
||||
//used in town_land.h
|
||||
//CNST1..3 = Those are the different stages of construction
|
||||
//The last 2 hexas correspond to the type of building it represent, if any
|
||||
SPR_CNST1_TALLOFFICE_00 = 1421,
|
||||
SPR_CNST2_TALLOFFICE_00 = 1422,
|
||||
SPR_CNST3_TALLOFFICE_00 = 1423,
|
||||
SPR_GROUND_TALLOFFICE_00 = 1424,
|
||||
SPR_BUILD_TALLOFFICE_00 = 1425, //temperate
|
||||
SPR_CNST1_OFFICE_01 = 1426,
|
||||
SPR_CNST2_OFFICE_01 = 1427,
|
||||
SPR_BUILD_OFFICE_01 = 1428, //temperate
|
||||
SPR_GROUND_OFFICE_01 = 1429,
|
||||
SPR_CNST1_SMLBLCKFLATS_02 = 1430, //Small Block of Flats
|
||||
SPR_CNST2_SMLBLCKFLATS_02 = 1431,
|
||||
SPR_BUILD_SMLBLCKFLATS_02 = 1432, //temperate
|
||||
SPR_GROUND_SMLBLCKFLATS_02 = 1433,
|
||||
SPR_CNST1_TEMPCHURCH = 1434,
|
||||
SPR_CNST2_TEMPCHURCH = 1435,
|
||||
SPR_BUILD_TEMPCHURCH = 1436,
|
||||
SPR_GROUND_TEMPCHURCH = 1437,
|
||||
SPR_CNST1_LARGEOFFICE_04 = 1440,
|
||||
SPR_CNST2_LARGEOFFICE_04 = 1441,
|
||||
SPR_BUILD_LARGEOFFICE_04 = 1442, // temperate, sub-arctic, subtropical
|
||||
SPR_BUILD_LARGEOFFICE_04_SNOW = 4569, // same, with snow
|
||||
// These are in fact two houses for the same houseID. so V1 and V2
|
||||
SPR_CNST1_TOWNHOUSE_06_V1 = 1444,
|
||||
SPR_CNST2_TOWNHOUSE_06_V1 = 1445,
|
||||
SPR_BUILD_TOWNHOUSE_06_V1 = 1446, // 1st variation
|
||||
SPR_GRND_TOWNHOUSE_06_V1 = 1447,
|
||||
SPR_CNST1_TOWNHOUSE_06_V2 = 1501, // used as ground, but is stage1
|
||||
SPR_CNST1_TOWNHOUSE_06_V2_P = 1502, // pipes extensions for previous
|
||||
SPR_CNST2_TOWNHOUSE_06_V2_G = 1503, // Ground of cnst stage 2
|
||||
SPR_CNST2_TOWNHOUSE_06_V2 = 1504, // real cnst stage 2
|
||||
SPR_GRND_TOWNHOUSE_06_V2 = 1505,
|
||||
SPR_BUILD_TOWNHOUSE_06_V2 = 1506, // 2nd variation
|
||||
SPR_CNST1_HOTEL_07_NW = 1448,
|
||||
SPR_CNST2_HOTEL_07_NW = 1449,
|
||||
SPR_BUILD_HOTEL_07_NW = 1450,
|
||||
SPR_CNST1_HOTEL_07_SE = 1451,
|
||||
SPR_CNST2_HOTEL_07_SE = 1452,
|
||||
SPR_BUILD_HOTEL_07_SE = 1453,
|
||||
SPR_STATUE_HORSERIDER_09 = 1454,
|
||||
SPR_FOUNTAIN_0A = 1455,
|
||||
SPR_PARKSTATUE_0B = 1456,
|
||||
SPR_PARKALLEY_0C = 1457,
|
||||
SPR_CNST1_OFFICE_0D = 1458,
|
||||
SPR_CNST2_OFFICE_0D = 1459,
|
||||
SPR_BUILD_OFFICE_0D = 1460,
|
||||
SPR_CNST1_SHOPOFFICE_0E = 1461,
|
||||
SPR_CNST2_SHOPOFFICE_0E = 1462,
|
||||
SPR_BUILD_SHOPOFFICE_0E = 1463,
|
||||
SPR_CNST1_SHOPOFFICE_0F = 1464,
|
||||
SPR_CNST2_SHOPOFFICE_0F = 1465,
|
||||
SPR_BUILD_SHOPOFFICE_0F = 1466,
|
||||
|
||||
/* Easter egg/disaster sprites */
|
||||
SPR_BLIMP = 3905, // Zeppelin
|
||||
SPR_BLIMP_CRASHING = 3906,
|
||||
|
|
@ -963,6 +1016,7 @@ typedef enum CursorSprites {
|
|||
SPR_CURSOR_EW_MAGLEV = 1273,
|
||||
SPR_CURSOR_NWSE_MAGLEV = 1274,
|
||||
|
||||
SPR_CURSOR_RAIL_DEPOT = 1296,
|
||||
SPR_CURSOR_RAIL_STATION = 1300,
|
||||
|
||||
SPR_CURSOR_TUNNEL_RAIL = 2434,
|
||||
|
|
@ -974,8 +1028,6 @@ typedef enum CursorSprites {
|
|||
SPR_CURSOR_AUTOMAGLEV = SPR_OPENTTD_BASE + 6,
|
||||
|
||||
SPR_CURSOR_WAYPOINT = SPR_OPENTTD_BASE + 7,
|
||||
|
||||
SPR_CURSOR_RAIL_DEPOT = 1296,
|
||||
SPR_CURSOR_MONO_DEPOT = SPR_OPENTTD_BASE + 11,
|
||||
SPR_CURSOR_MAGLEV_DEPOT = SPR_OPENTTD_BASE + 12,
|
||||
|
||||
|
|
@ -1045,8 +1097,7 @@ enum Modifiers {
|
|||
|
||||
/** Masks needed for sprite operations.
|
||||
* @note Do not modify this enum. Alter SpriteSetup instead
|
||||
* @see SpriteSetup
|
||||
*/
|
||||
* @see SpriteSetup */
|
||||
enum SpriteMasks {
|
||||
///Maximum number of sprites that can be loaded at a given time.
|
||||
MAX_SPRITES = (1 << SPRITE_WIDTH) - 1,
|
||||
|
|
@ -1121,7 +1172,7 @@ enum PaletteSprites {
|
|||
PALETTE_59E = PALETTE_RECOLOR_SPRITE(0x59E),
|
||||
PALETTE_59F = PALETTE_RECOLOR_SPRITE(0x59F),
|
||||
};
|
||||
#undef PALETTE_RECOLOR_SPRITE
|
||||
/* #undef PALETTE_RECOLOR_SPRITE commented because needed in newgrf.c*/
|
||||
|
||||
#define MAKE_TRANSPARENT(img) (img = (img & SPRITE_MASK) | PALETTE_TO_TRANSPARENT)
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -117,7 +117,7 @@ static void DrawTile_Unmovable(TileInfo *ti)
|
|||
if (ti->map5 == 2) {
|
||||
|
||||
// statue
|
||||
DrawGroundSprite(SPR_STATUE_GROUND);
|
||||
DrawGroundSprite(SPR_CONCRETE_GROUND);
|
||||
|
||||
image = PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile));
|
||||
image += PALETTE_MODIFIER_COLOR | SPR_STATUE_COMPANY;
|
||||
|
|
|
|||
Loading…
Reference in New Issue