diff --git a/resources/g2/10.png b/resources/g2/10.png new file mode 100644 index 0000000000..296f07c150 Binary files /dev/null and b/resources/g2/10.png differ diff --git a/resources/g2/11.png b/resources/g2/11.png new file mode 100644 index 0000000000..4d7afd5519 Binary files /dev/null and b/resources/g2/11.png differ diff --git a/resources/g2/7.png b/resources/g2/7.png new file mode 100644 index 0000000000..205d3c50a4 Binary files /dev/null and b/resources/g2/7.png differ diff --git a/resources/g2/8.png b/resources/g2/8.png new file mode 100644 index 0000000000..283c1fc325 Binary files /dev/null and b/resources/g2/8.png differ diff --git a/resources/g2/9.png b/resources/g2/9.png new file mode 100644 index 0000000000..750be39876 Binary files /dev/null and b/resources/g2/9.png differ diff --git a/src/cmdline_sprite.c b/src/cmdline_sprite.c index d87ce21a9d..77811394c5 100644 --- a/src/cmdline_sprite.c +++ b/src/cmdline_sprite.c @@ -178,7 +178,7 @@ int get_palette_index(uint32 colour) if (rgba[3] < 128) return -1; - for (int i = 10; i < 246; i++) { + for (int i = 0; i < 256; i++) { if (spriteFilePalette[i].r != rgba[0]) continue; if (spriteFilePalette[i].g != rgba[1]) continue; if (spriteFilePalette[i].b != rgba[2]) continue; @@ -489,6 +489,10 @@ int cmdline_for_sprite(const char **argv, int argc) } static rct_sprite_file_palette_entry _standardPalette[256] = { + // 0 (unused) + { 0, 0, 0, 255 }, + + // 1 - 9 (misc. e.g. font and water) { 0, 0, 0, 255 }, { 0, 0, 0, 255 }, { 0, 0, 0, 255 }, @@ -498,7 +502,8 @@ static rct_sprite_file_palette_entry _standardPalette[256] = { { 0, 0, 0, 255 }, { 0, 0, 0, 255 }, { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, + + // { 35, 35, 23, 255 }, { 51, 51, 35, 255 }, { 67, 67, 47, 255 }, @@ -691,7 +696,9 @@ static rct_sprite_file_palette_entry _standardPalette[256] = { { 207, 207, 131, 255 }, { 231, 231, 171, 255 }, { 255, 255, 207, 255 }, - { 27, 0, 63, 255 }, + + // 203 - 214 (Secondary remap) + { 27, 0, 63, 255 }, { 51, 0, 103, 255 }, { 63, 11, 123, 255 }, { 79, 23, 143, 255 }, @@ -703,6 +710,8 @@ static rct_sprite_file_palette_entry _standardPalette[256] = { { 203, 151, 247, 255 }, { 223, 183, 251, 255 }, { 239, 215, 255, 255 }, + + // 214 - 225 (Brown) { 0, 19, 39, 255 }, { 7, 31, 55, 255 }, { 15, 47, 71, 255 }, @@ -715,10 +724,16 @@ static rct_sprite_file_palette_entry _standardPalette[256] = { { 171, 195, 207, 255 }, { 195, 219, 231, 255 }, { 223, 243, 255, 255 }, + + // 226 (unknown) { 75, 75, 55, 255 }, + + // 227 - 229 (tertiary remap) { 0, 183, 255, 255 }, { 0, 219, 255, 255 }, { 0, 255, 255, 255 }, + + // 230 - 239 (water) { 99, 107, 7, 255 }, { 99, 107, 7, 255 }, { 135, 143, 39, 255 }, @@ -729,20 +744,31 @@ static rct_sprite_file_palette_entry _standardPalette[256] = { { 227, 227, 155, 255 }, { 203, 203, 115, 255 }, { 151, 155, 55, 255 }, + + // 240 - 242 (chain lift) { 91, 91, 67, 255 }, { 107, 107, 83, 255 }, { 123, 123, 99, 255 }, - { 47, 47, 47, 255 }, - { 47, 47, 47, 255 }, - { 47, 71, 87, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 }, + + // Old 243 - 245, changed to nice shade remap below + // { 47, 47, 47, 255 }, + // { 47, 47, 47, 255 }, + // { 47, 71, 87, 255 }, + + // 243 to 254 (primary remap) + { 47, 51, 111, 255 }, + { 47, 55, 131, 255 }, + { 51, 63, 151, 255 }, + { 51, 67, 171, 255 }, + { 47, 75, 191, 255 }, + { 43, 79, 211, 255 }, + { 35, 87, 231, 255 }, + { 31, 95, 255, 255 }, + { 39, 127, 255, 255 }, + { 51, 155, 255, 255 }, + { 63, 183, 255, 255 }, + { 75, 207, 255, 255 }, + + // 255 (unused?) { 0, 0, 0, 255 } }; \ No newline at end of file diff --git a/src/sprites.h b/src/sprites.h index 263b4a7964..6c7c150c47 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -253,107 +253,114 @@ enum { SPR_TAB_OBJECTIVE_15 = SPR_TAB_OBJECTIVE_0 + 15, SPR_TAB_AWARDS = 5527, -SPR_TAB_QUESTION = 5528, + SPR_TAB_QUESTION = 5528, -SPR_TAB_GUESTS_0 = 5568, -SPR_TAB_GUESTS_1 = SPR_TAB_GUESTS_0 + 1, -SPR_TAB_GUESTS_2 = SPR_TAB_GUESTS_0 + 2, -SPR_TAB_GUESTS_3 = SPR_TAB_GUESTS_0 + 3, -SPR_TAB_GUESTS_4 = SPR_TAB_GUESTS_0 + 4, -SPR_TAB_GUESTS_5 = SPR_TAB_GUESTS_0 + 5, -SPR_TAB_GUESTS_6 = SPR_TAB_GUESTS_0 + 6, -SPR_TAB_GUESTS_7 = SPR_TAB_GUESTS_0 + 7, -SPR_TAB_GUESTS_8 = SPR_TAB_GUESTS_0 + 8, -SPR_TAB_GUESTS_9 = SPR_TAB_GUESTS_0 + 9, -SPR_TAB_GUESTS_10 = SPR_TAB_GUESTS_0 + 10, -SPR_TAB_GUESTS_11 = SPR_TAB_GUESTS_0 + 11, -SPR_TAB_GUESTS_12 = SPR_TAB_GUESTS_0 + 12, -SPR_TAB_GUESTS_13 = SPR_TAB_GUESTS_0 + 13, -SPR_TAB_GUESTS_14 = SPR_TAB_GUESTS_0 + 14, -SPR_TAB_GUESTS_15 = SPR_TAB_GUESTS_0 + 15, + SPR_TAB_GUESTS_0 = 5568, + SPR_TAB_GUESTS_1 = SPR_TAB_GUESTS_0 + 1, + SPR_TAB_GUESTS_2 = SPR_TAB_GUESTS_0 + 2, + SPR_TAB_GUESTS_3 = SPR_TAB_GUESTS_0 + 3, + SPR_TAB_GUESTS_4 = SPR_TAB_GUESTS_0 + 4, + SPR_TAB_GUESTS_5 = SPR_TAB_GUESTS_0 + 5, + SPR_TAB_GUESTS_6 = SPR_TAB_GUESTS_0 + 6, + SPR_TAB_GUESTS_7 = SPR_TAB_GUESTS_0 + 7, + SPR_TAB_GUESTS_8 = SPR_TAB_GUESTS_0 + 8, + SPR_TAB_GUESTS_9 = SPR_TAB_GUESTS_0 + 9, + SPR_TAB_GUESTS_10 = SPR_TAB_GUESTS_0 + 10, + SPR_TAB_GUESTS_11 = SPR_TAB_GUESTS_0 + 11, + SPR_TAB_GUESTS_12 = SPR_TAB_GUESTS_0 + 12, + SPR_TAB_GUESTS_13 = SPR_TAB_GUESTS_0 + 13, + SPR_TAB_GUESTS_14 = SPR_TAB_GUESTS_0 + 14, + SPR_TAB_GUESTS_15 = SPR_TAB_GUESTS_0 + 15, -SPR_FLOOR_TEXTURE_GRASS = 5579, -SPR_FLOOR_TEXTURE_SAND = SPR_FLOOR_TEXTURE_GRASS + 1, -SPR_FLOOR_TEXTURE_DIRT = SPR_FLOOR_TEXTURE_GRASS + 2, -SPR_FLOOR_TEXTURE_ROCK = SPR_FLOOR_TEXTURE_GRASS + 3, -SPR_FLOOR_TEXTURE_MARTIAN = SPR_FLOOR_TEXTURE_GRASS + 4, -SPR_FLOOR_TEXTURE_CHECKERBOARD = SPR_FLOOR_TEXTURE_GRASS + 5, -SPR_FLOOR_TEXTURE_GRASS_CLUMPS = SPR_FLOOR_TEXTURE_GRASS + 6, -SPR_FLOOR_TEXTURE_ICE = SPR_FLOOR_TEXTURE_GRASS + 7, -SPR_FLOOR_TEXTURE_GRID_RED = SPR_FLOOR_TEXTURE_GRASS + 8, -SPR_FLOOR_TEXTURE_GRID_YELLOW = SPR_FLOOR_TEXTURE_GRASS + 9, -SPR_FLOOR_TEXTURE_GRID_BLUE = SPR_FLOOR_TEXTURE_GRASS + 10, -SPR_FLOOR_TEXTURE_GRID_GREEN = SPR_FLOOR_TEXTURE_GRASS + 11, -SPR_FLOOR_TEXTURE_SAND_DARK = SPR_FLOOR_TEXTURE_GRASS + 12, -SPR_FLOOR_TEXTURE_SAND_LIGHT = SPR_FLOOR_TEXTURE_GRASS + 13, + SPR_FLOOR_TEXTURE_GRASS = 5579, + SPR_FLOOR_TEXTURE_SAND = SPR_FLOOR_TEXTURE_GRASS + 1, + SPR_FLOOR_TEXTURE_DIRT = SPR_FLOOR_TEXTURE_GRASS + 2, + SPR_FLOOR_TEXTURE_ROCK = SPR_FLOOR_TEXTURE_GRASS + 3, + SPR_FLOOR_TEXTURE_MARTIAN = SPR_FLOOR_TEXTURE_GRASS + 4, + SPR_FLOOR_TEXTURE_CHECKERBOARD = SPR_FLOOR_TEXTURE_GRASS + 5, + SPR_FLOOR_TEXTURE_GRASS_CLUMPS = SPR_FLOOR_TEXTURE_GRASS + 6, + SPR_FLOOR_TEXTURE_ICE = SPR_FLOOR_TEXTURE_GRASS + 7, + SPR_FLOOR_TEXTURE_GRID_RED = SPR_FLOOR_TEXTURE_GRASS + 8, + SPR_FLOOR_TEXTURE_GRID_YELLOW = SPR_FLOOR_TEXTURE_GRASS + 9, + SPR_FLOOR_TEXTURE_GRID_BLUE = SPR_FLOOR_TEXTURE_GRASS + 10, + SPR_FLOOR_TEXTURE_GRID_GREEN = SPR_FLOOR_TEXTURE_GRASS + 11, + SPR_FLOOR_TEXTURE_SAND_DARK = SPR_FLOOR_TEXTURE_GRASS + 12, + SPR_FLOOR_TEXTURE_SAND_LIGHT = SPR_FLOOR_TEXTURE_GRASS + 13, -SPR_WALL_TEXTURE_ROCK = 5593, -SPR_WALL_TEXTURE_WOOD_RED = SPR_WALL_TEXTURE_ROCK + 1, -SPR_WALL_TEXTURE_WOOD_BLACK = SPR_WALL_TEXTURE_ROCK + 2, -SPR_WALL_TEXTURE_ICE = SPR_WALL_TEXTURE_ROCK + 3, + SPR_WALL_TEXTURE_ROCK = 5593, + SPR_WALL_TEXTURE_WOOD_RED = SPR_WALL_TEXTURE_ROCK + 1, + SPR_WALL_TEXTURE_WOOD_BLACK = SPR_WALL_TEXTURE_ROCK + 2, + SPR_WALL_TEXTURE_ICE = SPR_WALL_TEXTURE_ROCK + 3, -SPR_TOOLBAR_PAUSE = 5597, -SPR_TOOLBAR_FILE = 5599, -SPR_TOOLBAR_ZOOM_OUT = 5601, -SPR_TOOLBAR_ZOOM_IN = 5604, -SPR_TOOLBAR_ROTATE = 5607, -SPR_TOOLBAR_LAND = 5609, -SPR_TOOLBAR_MAP = 5611, -SPR_TOOLBAR_GUESTS = 5613, -SPR_TOOLBAR_SCENERY = 5615, -SPR_TOOLBAR_WATER = 5617, -SPR_TOOLBAR_RIDES = 5619, -SPR_TOOLBAR_VIEW = 5621, -SPR_TOOLBAR_FOOTPATH = 5623, -SPR_TOOLBAR_STAFF = 5627, -SPR_TOOLBAR_PARK = 5629, -SPR_TOOLBAR_CONSTRUCT_RIDE = 5631, -SPR_TOOLBAR_CLEAR_SCENERY = 5633, + SPR_TOOLBAR_PAUSE = 5597, + SPR_TOOLBAR_FILE = 5599, + SPR_TOOLBAR_ZOOM_OUT = 5601, + SPR_TOOLBAR_ZOOM_IN = 5604, + SPR_TOOLBAR_ROTATE = 5607, + SPR_TOOLBAR_LAND = 5609, + SPR_TOOLBAR_MAP = 5611, + SPR_TOOLBAR_GUESTS = 5613, + SPR_TOOLBAR_SCENERY = 5615, + SPR_TOOLBAR_WATER = 5617, + SPR_TOOLBAR_RIDES = 5619, + SPR_TOOLBAR_VIEW = 5621, + SPR_TOOLBAR_FOOTPATH = 5623, + SPR_TOOLBAR_STAFF = 5627, + SPR_TOOLBAR_PARK = 5629, + SPR_TOOLBAR_CONSTRUCT_RIDE = 5631, + SPR_TOOLBAR_CLEAR_SCENERY = 5633, -SPR_NEXT_WEATHER = 23189, -SPR_WEATHER_SUN = 23190, -SPR_WEATHER_SUN_CLOUD = 23191, -SPR_WEATHER_CLOUD = 23192, -SPR_WEATHER_LIGHT_RAIN = 23193, -SPR_WEATHER_HEAVY_RAIN = 23194, -SPR_WEATHER_STORM = 23195, -SPR_WEATHER_UNKNOWN = 23196, + SPR_NEXT_WEATHER = 23189, + SPR_WEATHER_SUN = 23190, + SPR_WEATHER_SUN_CLOUD = 23191, + SPR_WEATHER_CLOUD = 23192, + SPR_WEATHER_LIGHT_RAIN = 23193, + SPR_WEATHER_HEAVY_RAIN = 23194, + SPR_WEATHER_STORM = 23195, + SPR_WEATHER_UNKNOWN = 23196, -SPR_RATING_LOW = 23197, -SPR_RATING_HIGH = 23198, + SPR_RATING_LOW = 23197, + SPR_RATING_HIGH = 23198, -SPR_MENU_NEW_GAME = 23207, -SPR_MENU_LOAD_GAME = 23208, -SPR_MENU_TUTORIAL = 23209, -SPR_MENU_EXIT = 23210, -SPR_MENU_TOOLBOX = 23211, -SPR_MENU_LOGO = 23212, -SPR_CREDITS_LOGO_SMALL = 23213, -SPR_CREDITS_CHRIS_SAWYER_SMALL = 23214, -SPR_INTRO_CHRIS_SAWYER_00 = 23215, -SPR_INTRO_CHRIS_SAWYER_10 = SPR_INTRO_CHRIS_SAWYER_00 + 1, -SPR_INTRO_LOGO_00 = 23218, -SPR_INTRO_LOGO_10 = SPR_INTRO_LOGO_00 + 1, -SPR_INTRO_LOGO_20 = SPR_INTRO_LOGO_00 + 2, -SPR_INTRO_LOGO_01 = SPR_INTRO_LOGO_00 + 3, -SPR_INTRO_LOGO_11 = SPR_INTRO_LOGO_00 + 4, -SPR_INTRO_LOGO_21 = SPR_INTRO_LOGO_00 + 5, + SPR_MENU_NEW_GAME = 23207, + SPR_MENU_LOAD_GAME = 23208, + SPR_MENU_TUTORIAL = 23209, + SPR_MENU_EXIT = 23210, + SPR_MENU_TOOLBOX = 23211, + SPR_MENU_LOGO = 23212, + SPR_CREDITS_LOGO_SMALL = 23213, + SPR_CREDITS_CHRIS_SAWYER_SMALL = 23214, + SPR_INTRO_CHRIS_SAWYER_00 = 23215, + SPR_INTRO_CHRIS_SAWYER_10 = SPR_INTRO_CHRIS_SAWYER_00 + 1, + SPR_INTRO_LOGO_00 = 23218, + SPR_INTRO_LOGO_10 = SPR_INTRO_LOGO_00 + 1, + SPR_INTRO_LOGO_20 = SPR_INTRO_LOGO_00 + 2, + SPR_INTRO_LOGO_01 = SPR_INTRO_LOGO_00 + 3, + SPR_INTRO_LOGO_11 = SPR_INTRO_LOGO_00 + 4, + SPR_INTRO_LOGO_21 = SPR_INTRO_LOGO_00 + 5, -SPR_SIX_FLAGS = 23225, -SPR_INTRO_INFOGRAMES_00 = 23226, -SPR_INTRO_INFOGRAMES_10 = SPR_INTRO_INFOGRAMES_00 + 1, -SPR_INTRO_INFOGRAMES_01 = SPR_INTRO_INFOGRAMES_00 + 2, -SPR_INTRO_INFOGRAMES_11 = SPR_INTRO_INFOGRAMES_00 + 3, -SPR_CREDITS_INFOGRAMES = 23230, + SPR_SIX_FLAGS = 23225, + SPR_INTRO_INFOGRAMES_00 = 23226, + SPR_INTRO_INFOGRAMES_10 = SPR_INTRO_INFOGRAMES_00 + 1, + SPR_INTRO_INFOGRAMES_01 = SPR_INTRO_INFOGRAMES_00 + 2, + SPR_INTRO_INFOGRAMES_11 = SPR_INTRO_INFOGRAMES_00 + 3, + SPR_CREDITS_INFOGRAMES = 23230, -SPR_G2_BEGIN = 324288, -SPR_G2_LOGO = SPR_G2_BEGIN + 0, -SPR_G2_TITLE = SPR_G2_BEGIN + 1, -SPR_G2_FASTFORWARD = SPR_G2_BEGIN + 2, -SPR_G2_SPEED_ARROW = SPR_G2_BEGIN + 3, -SPR_G2_HYPER_ARROW = SPR_G2_BEGIN + 4, -SPR_G2_TAB_TWITCH = SPR_G2_BEGIN + 5, -SPR_G2_TAB_LAND = SPR_G2_BEGIN + 6 + SPR_G2_BEGIN = 324288, + SPR_G2_LOGO = SPR_G2_BEGIN + 0, + SPR_G2_TITLE = SPR_G2_BEGIN + 1, + SPR_G2_FASTFORWARD = SPR_G2_BEGIN + 2, + SPR_G2_SPEED_ARROW = SPR_G2_BEGIN + 3, + SPR_G2_HYPER_ARROW = SPR_G2_BEGIN + 4, + SPR_G2_TAB_TWITCH = SPR_G2_BEGIN + 5, + SPR_G2_TAB_LAND = SPR_G2_BEGIN + 6, + + SPR_G2_PLACEHOLDER = SPR_G2_BEGIN + 7, + + SPR_G2_ZOOM_IN = SPR_G2_BEGIN + 8, + SPR_G2_ZOOM_IN_DISABLED = SPR_G2_BEGIN + 9, + SPR_G2_ZOOM_OUT = SPR_G2_BEGIN + 10, + SPR_G2_ZOOM_OUT_DISABLED = SPR_G2_BEGIN + 11, }; #endif diff --git a/src/windows/options.c b/src/windows/options.c index 9829af7465..12979b66af 100644 --- a/src/windows/options.c +++ b/src/windows/options.c @@ -980,7 +980,6 @@ static void window_options_paint() { rct_window *w; rct_drawpixelinfo *dpi; - char buffer[256]; window_paint_get_registers(w, dpi); diff --git a/src/windows/viewport.c b/src/windows/viewport.c index 2d3e98d96c..11147d8df5 100644 --- a/src/windows/viewport.c +++ b/src/windows/viewport.c @@ -45,15 +45,15 @@ enum { }; static rct_widget window_viewport_widgets[] = { - { WWT_FRAME, 0, 0, 0, 0, 0, 0xFFFFFFFF, STR_NONE }, // panel / background - { WWT_CAPTION, 0, 1, 0, 1, 14, 2779, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, 0, 0, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP }, // close x button - { WWT_RESIZE, 1, 0, 0, 14, 0, 0xFFFFFFFF, STR_NONE }, // resize - { WWT_VIEWPORT, 0, 3, 0, 17, 0, 0xFFFFFFFF, STR_NONE }, // viewport + { WWT_FRAME, 0, 0, 0, 0, 0, 0xFFFFFFFF, STR_NONE }, // panel / background + { WWT_CAPTION, 0, 1, 0, 1, 14, 2779, STR_WINDOW_TITLE_TIP }, // title bar + { WWT_CLOSEBOX, 0, 0, 0, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_RESIZE, 1, 0, 0, 14, 0, 0xFFFFFFFF, STR_NONE }, // resize + { WWT_VIEWPORT, 0, 3, 0, 17, 0, 0xFFFFFFFF, STR_NONE }, // viewport - { WWT_FLATBTN, 0, 0, 0, 17, 40, 0xFFFFFFFF, STR_ZOOM_IN_TIP }, // zoom in - { WWT_FLATBTN, 0, 0, 0, 41, 64, 0xFFFFFFFF, STR_ZOOM_OUT_TIP }, // zoom out - { WWT_FLATBTN, 0, 0, 0, 65, 88, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // locate + { WWT_FLATBTN, 0, 0, 0, 17, 40, SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP }, // zoom in + { WWT_FLATBTN, 0, 0, 0, 41, 64, SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // zoom out + { WWT_FLATBTN, 0, 0, 0, 65, 88, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // locate { WIDGETS_END }, };