miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CM_ prefix to all CityMania sprite constants and new icon for c&p

Browse Source
This commit is contained in:
dP
2021-09-28 23:15:50 +03:00
parent 239ff976da
commit cd2da419a5
10 changed files with 181 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table/sprites.h
+41 -39
View File
@@ -310,48 +310,50 @@ static const SpriteID SPR_PALETTE_BASE = SPR_EMPTY_BOUNDING_BOX + EMPTY_BOUNDING
static const uint16 PALETTE_SPRITE_COUNT = 1;
/* zoning stuff */
static const SpriteID SPR_INNER_HIGHLIGHT_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
static const SpriteID SPR_IMG_COMPANY_CARGO = SPR_INNER_HIGHLIGHT_BASE + 19;
static const SpriteID SPR_IMG_COMPANY_GOAL = SPR_INNER_HIGHLIGHT_BASE + 20;
static const SpriteID SPR_IMG_HOUSE_NEW = SPR_INNER_HIGHLIGHT_BASE + 21;
static const SpriteID SPR_PALETTE_ZONING_RED = SPR_INNER_HIGHLIGHT_BASE + 22;
static const SpriteID SPR_PALETTE_ZONING_GREEN = SPR_INNER_HIGHLIGHT_BASE + 23;
static const SpriteID SPR_PALETTE_ZONING_BLACK = SPR_INNER_HIGHLIGHT_BASE + 24;
static const SpriteID SPR_PALETTE_ZONING_LIGHT_BLUE = SPR_INNER_HIGHLIGHT_BASE + 25;
static const SpriteID SPR_PALETTE_ZONING_ORANGE = SPR_INNER_HIGHLIGHT_BASE + 26;
static const SpriteID SPR_PALETTE_ZONING_WHITE = SPR_INNER_HIGHLIGHT_BASE + 27;
static const SpriteID SPR_PALETTE_ZONING_YELLOW = SPR_INNER_HIGHLIGHT_BASE + 28;
static const SpriteID SPR_PALETTE_ZONING_PURPLE = SPR_INNER_HIGHLIGHT_BASE + 29;
static const SpriteID SPR_INNER_HIGHLIGHT_COUNT = 30;
static const SpriteID CM_SPR_CITYMANIA_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
static const SpriteID CM_SPR_RAIL_COPY_PASTE = CM_SPR_CITYMANIA_BASE;
static const SpriteID CM_SPR_INNER_HIGHLIGHT_BASE = CM_SPR_CITYMANIA_BASE + 2;
static const SpriteID CM_SPR_IMG_COMPANY_CARGO = CM_SPR_INNER_HIGHLIGHT_BASE + 19;
static const SpriteID CM_SPR_IMG_COMPANY_GOAL = CM_SPR_INNER_HIGHLIGHT_BASE + 20;
static const SpriteID CM_SPR_IMG_HOUSE_NEW = CM_SPR_INNER_HIGHLIGHT_BASE + 21;
static const SpriteID CM_SPR_PALETTE_ZONING_RED = CM_SPR_INNER_HIGHLIGHT_BASE + 22;
static const SpriteID CM_SPR_PALETTE_ZONING_GREEN = CM_SPR_INNER_HIGHLIGHT_BASE + 23;
static const SpriteID CM_SPR_PALETTE_ZONING_BLACK = CM_SPR_INNER_HIGHLIGHT_BASE + 24;
static const SpriteID CM_SPR_PALETTE_ZONING_LIGHT_BLUE = CM_SPR_INNER_HIGHLIGHT_BASE + 25;
static const SpriteID CM_SPR_PALETTE_ZONING_ORANGE = CM_SPR_INNER_HIGHLIGHT_BASE + 26;
static const SpriteID CM_SPR_PALETTE_ZONING_WHITE = CM_SPR_INNER_HIGHLIGHT_BASE + 27;
static const SpriteID CM_SPR_PALETTE_ZONING_YELLOW = CM_SPR_INNER_HIGHLIGHT_BASE + 28;
static const SpriteID CM_SPR_PALETTE_ZONING_PURPLE = CM_SPR_INNER_HIGHLIGHT_BASE + 29;
static const SpriteID CM_SPR_INNER_HIGHLIGHT_COUNT = 30;
static const SpriteID SPR_BORDER_HIGHLIGHT_BASE = SPR_INNER_HIGHLIGHT_BASE + SPR_INNER_HIGHLIGHT_COUNT + 1;
static const SpriteID SPR_BORDER_HIGHLIGHT_COUNT = 19 * 19;
static const SpriteID PALETTE_TINT_BASE = SPR_BORDER_HIGHLIGHT_BASE + SPR_BORDER_HIGHLIGHT_COUNT;
static const SpriteID PALETTE_TINT_RED_DEEP = PALETTE_TINT_BASE;
static const SpriteID PALETTE_TINT_ORANGE_DEEP = PALETTE_TINT_BASE + 1;
static const SpriteID PALETTE_TINT_GREEN_DEEP = PALETTE_TINT_BASE + 2;
static const SpriteID PALETTE_TINT_CYAN_DEEP = PALETTE_TINT_BASE + 3;
static const SpriteID PALETTE_TINT_RED = PALETTE_TINT_BASE + 4;
static const SpriteID PALETTE_TINT_ORANGE = PALETTE_TINT_BASE + 5;
static const SpriteID PALETTE_TINT_YELLOW = PALETTE_TINT_BASE + 6;
static const SpriteID PALETTE_TINT_YELLOW_WHITE = PALETTE_TINT_BASE + 7;
static const SpriteID PALETTE_TINT_WHITE = PALETTE_TINT_BASE + 8;
static const SpriteID PALETTE_TINT_GREEN = PALETTE_TINT_BASE + 9;
static const SpriteID PALETTE_TINT_CYAN = PALETTE_TINT_BASE + 10;
static const SpriteID PALETTE_TINT_CYAN_WHITE = PALETTE_TINT_BASE + 11;
static const SpriteID PALETTE_TINT_BLUE = PALETTE_TINT_BASE + 12;
static const SpriteID PALETTE_SHADE_N = PALETTE_TINT_BASE + 13;
static const SpriteID PALETTE_SHADE_NE = PALETTE_TINT_BASE + 14;
static const SpriteID PALETTE_SHADE_E = PALETTE_TINT_BASE + 15;
static const SpriteID PALETTE_SHADE_SE = PALETTE_TINT_BASE + 16;
static const SpriteID PALETTE_SHADE_S = PALETTE_TINT_BASE + 17;
static const SpriteID PALETTE_SHADE_SW = PALETTE_TINT_BASE + 18;
static const SpriteID PALETTE_SHADE_W = PALETTE_TINT_BASE + 19;
static const SpriteID PALETTE_SHADE_NW = PALETTE_TINT_BASE + 20;
static const SpriteID PALETTE_TINT_COUNT = 13 + 8;
static const SpriteID CM_SPR_BORDER_HIGHLIGHT_BASE = CM_SPR_INNER_HIGHLIGHT_BASE + CM_SPR_INNER_HIGHLIGHT_COUNT + 1;
static const SpriteID CM_SPR_BORDER_HIGHLIGHT_COUNT = 19 * 19;
static const SpriteID CM_PALETTE_TINT_BASE = CM_SPR_BORDER_HIGHLIGHT_BASE + CM_SPR_BORDER_HIGHLIGHT_COUNT;
static const SpriteID CM_PALETTE_TINT_RED_DEEP = CM_PALETTE_TINT_BASE;
static const SpriteID CM_PALETTE_TINT_ORANGE_DEEP = CM_PALETTE_TINT_BASE + 1;
static const SpriteID CM_PALETTE_TINT_GREEN_DEEP = CM_PALETTE_TINT_BASE + 2;
static const SpriteID CM_PALETTE_TINT_CYAN_DEEP = CM_PALETTE_TINT_BASE + 3;
static const SpriteID CM_PALETTE_TINT_RED = CM_PALETTE_TINT_BASE + 4;
static const SpriteID CM_PALETTE_TINT_ORANGE = CM_PALETTE_TINT_BASE + 5;
static const SpriteID CM_PALETTE_TINT_YELLOW = CM_PALETTE_TINT_BASE + 6;
static const SpriteID CM_PALETTE_TINT_YELLOW_WHITE = CM_PALETTE_TINT_BASE + 7;
static const SpriteID CM_PALETTE_TINT_WHITE = CM_PALETTE_TINT_BASE + 8;
static const SpriteID CM_PALETTE_TINT_GREEN = CM_PALETTE_TINT_BASE + 9;
static const SpriteID CM_PALETTE_TINT_CYAN = CM_PALETTE_TINT_BASE + 10;
static const SpriteID CM_PALETTE_TINT_CYAN_WHITE = CM_PALETTE_TINT_BASE + 11;
static const SpriteID CM_PALETTE_TINT_BLUE = CM_PALETTE_TINT_BASE + 12;
static const SpriteID CM_PALETTE_SHADE_N = CM_PALETTE_TINT_BASE + 13;
static const SpriteID CM_PALETTE_SHADE_NE = CM_PALETTE_TINT_BASE + 14;
static const SpriteID CM_PALETTE_SHADE_E = CM_PALETTE_TINT_BASE + 15;
static const SpriteID CM_PALETTE_SHADE_SE = CM_PALETTE_TINT_BASE + 16;
static const SpriteID CM_PALETTE_SHADE_S = CM_PALETTE_TINT_BASE + 17;
static const SpriteID CM_PALETTE_SHADE_SW = CM_PALETTE_TINT_BASE + 18;
static const SpriteID CM_PALETTE_SHADE_W = CM_PALETTE_TINT_BASE + 19;
static const SpriteID CM_PALETTE_SHADE_NW = CM_PALETTE_TINT_BASE + 20;
static const SpriteID CM_PALETTE_TINT_COUNT = 13 + 8;
/* From where can we start putting NewGRFs? */
static const SpriteID SPR_NEWGRFS_BASE = PALETTE_TINT_BASE + PALETTE_TINT_COUNT;
static const SpriteID SPR_NEWGRFS_BASE = CM_PALETTE_TINT_BASE + CM_PALETTE_TINT_COUNT;
/* Manager face sprites */
static const SpriteID SPR_GRADIENT = 874; // background gradient behind manager face