g2: Remove all possible instances of `SPR_G2_CHAR_BEGIN +`

This commit is contained in:
AuraSpecs 2022-11-03 18:20:52 +01:00 committed by GitHub
parent 6b088e550c
commit 2e053a72e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 150 additions and 151 deletions

View File

@ -605,37 +605,6 @@ enum
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W = 28380,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_S_N = 28381,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W_PART_0_2 = 28382,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE = SPR_G2_BEGIN + 33,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE = SPR_G2_BEGIN + 34,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW = SPR_G2_BEGIN + 35,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SE_NW = SPR_G2_BEGIN + 36,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2 = SPR_G2_BEGIN + 37,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW_PART_0_2 = SPR_G2_BEGIN + 38,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SW_NE = SPR_G2_BEGIN + 45,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE = SPR_G2_BEGIN + 46,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW = SPR_G2_BEGIN + 47,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SE_NW = SPR_G2_BEGIN + 48,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE_PART_0_2 = SPR_G2_BEGIN + 49,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW_PART_0_2 = SPR_G2_BEGIN + 50,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE = SPR_G2_BEGIN + 39,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE = SPR_G2_BEGIN + 40,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW = SPR_G2_BEGIN + 41,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SE_NW = SPR_G2_BEGIN + 42,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2 = SPR_G2_BEGIN + 43,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW_PART_0_2 = SPR_G2_BEGIN + 44,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SW_NE = SPR_G2_BEGIN + 51,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE = SPR_G2_BEGIN + 52,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW = SPR_G2_BEGIN + 53,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SE_NW = SPR_G2_BEGIN + 54,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2 = SPR_G2_BEGIN + 55,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2 = SPR_G2_BEGIN + 56,
SPR_JUNIOR_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 67,
SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 68,
};
static constexpr const uint32_t junior_rc_track_pieces_flat[3][4] = {

View File

@ -874,50 +874,77 @@ enum
SPR_G1_END = 29294,
SPR_RCTC_G1_END = 29357, // The number of elements in RCTC's g1.dat file
// Start of OpenRCT2 additions (g2.dat)
SPR_G2_BEGIN = 29357,
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_LAND = SPR_G2_BEGIN + 5,
SPR_G2_TITLE,
SPR_G2_FASTFORWARD,
SPR_G2_SPEED_ARROW,
SPR_G2_HYPER_ARROW,
SPR_G2_TAB_LAND,
SPR_G2_PLACEHOLDER = SPR_G2_BEGIN + 6,
SPR_G2_PLACEHOLDER,
SPR_G2_ZOOM_IN = SPR_G2_BEGIN + 7,
SPR_G2_ZOOM_IN_DISABLED = SPR_G2_BEGIN + 8,
SPR_G2_ZOOM_OUT = SPR_G2_BEGIN + 9,
SPR_G2_ZOOM_OUT_DISABLED = SPR_G2_BEGIN + 10,
SPR_G2_ZOOM_IN,
SPR_G2_ZOOM_IN_DISABLED,
SPR_G2_ZOOM_OUT,
SPR_G2_ZOOM_OUT_DISABLED,
SPR_G2_TAB_TREE = SPR_G2_BEGIN + 11,
SPR_G2_TAB_PENCIL = SPR_G2_BEGIN + 12,
SPR_G2_BUTTON_LARGE_SCENERY = SPR_G2_BEGIN + 13,
SPR_G2_BUTTON_TREES = SPR_G2_BEGIN + 14,
SPR_G2_BUTTON_FOOTPATH = SPR_G2_BEGIN + 15,
SPR_G2_TAB_TREE,
SPR_G2_TAB_PENCIL,
SPR_G2_BUTTON_LARGE_SCENERY,
SPR_G2_BUTTON_TREES,
SPR_G2_BUTTON_FOOTPATH,
SPR_G2_RCT1_CLOSE_BUTTON_0 = SPR_G2_BEGIN + 16,
SPR_G2_RCT1_CLOSE_BUTTON_1 = SPR_G2_BEGIN + 17,
SPR_G2_RCT1_CLOSE_BUTTON_2 = SPR_G2_BEGIN + 18,
SPR_G2_RCT1_CLOSE_BUTTON_3 = SPR_G2_BEGIN + 19,
SPR_G2_RCT1_TEST_BUTTON_0 = SPR_G2_BEGIN + 20,
SPR_G2_RCT1_TEST_BUTTON_1 = SPR_G2_BEGIN + 21,
SPR_G2_RCT1_TEST_BUTTON_2 = SPR_G2_BEGIN + 22,
SPR_G2_RCT1_TEST_BUTTON_3 = SPR_G2_BEGIN + 23,
SPR_G2_RCT1_OPEN_BUTTON_0 = SPR_G2_BEGIN + 24,
SPR_G2_RCT1_OPEN_BUTTON_1 = SPR_G2_BEGIN + 25,
SPR_G2_RCT1_OPEN_BUTTON_2 = SPR_G2_BEGIN + 26,
SPR_G2_RCT1_OPEN_BUTTON_3 = SPR_G2_BEGIN + 27,
SPR_G2_RCT1_CLOSE_BUTTON_0,
SPR_G2_RCT1_CLOSE_BUTTON_1,
SPR_G2_RCT1_CLOSE_BUTTON_2,
SPR_G2_RCT1_CLOSE_BUTTON_3,
SPR_G2_RCT1_TEST_BUTTON_0,
SPR_G2_RCT1_TEST_BUTTON_1,
SPR_G2_RCT1_TEST_BUTTON_2,
SPR_G2_RCT1_TEST_BUTTON_3,
SPR_G2_RCT1_OPEN_BUTTON_0,
SPR_G2_RCT1_OPEN_BUTTON_1,
SPR_G2_RCT1_OPEN_BUTTON_2,
SPR_G2_RCT1_OPEN_BUTTON_3,
SPR_G2_TITLE_RESTART = SPR_G2_BEGIN + 28,
SPR_G2_TITLE_STOP = SPR_G2_BEGIN + 29,
SPR_G2_TITLE_PLAY = SPR_G2_BEGIN + 30,
SPR_G2_TITLE_SKIP = SPR_G2_BEGIN + 31,
SPR_G2_TITLE_RESTART,
SPR_G2_TITLE_STOP,
SPR_G2_TITLE_PLAY,
SPR_G2_TITLE_SKIP,
SPR_G2_SANDBOX = SPR_G2_BEGIN + 32,
SPR_G2_SANDBOX,
SPR_G2_TAB_NEWS = SPR_G2_BEGIN + 57,
SPR_G2_LOCKED = SPR_G2_BEGIN + 58,
SPR_G2_MENU_MULTIPLAYER = SPR_G2_BEGIN + 59,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SW_NE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2,
SPR_G2_TAB_NEWS,
SPR_G2_LOCKED,
SPR_G2_MENU_MULTIPLAYER,
SPR_G2_SORT,
SPR_G2_COPY,
@ -928,7 +955,10 @@ enum
SPR_G2_BM_BOOSTER_NE_SW,
SPR_G2_BM_BOOSTER_NW_SE,
SPR_G2_TOOLBAR_MUTE = SPR_G2_BM_BOOSTER_NW_SE + 3,
SPR_JUNIOR_RC_BOOSTER_NW_SE,
SPR_JUNIOR_RC_BOOSTER_NE_SW,
SPR_G2_TOOLBAR_MUTE,
SPR_G2_TOOLBAR_MUTE_PRESSED,
SPR_G2_TOOLBAR_UNMUTE,
SPR_G2_TOOLBAR_UNMUTE_PRESSED,
@ -937,21 +967,18 @@ enum
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3,
SPR_G2_MINIATURE_RAILWAY_BEGIN,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 0,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 1,
SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 2,
SPR_G2_MINIATURE_RAILWAY_GROOVED_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 3,
SPR_G2_MINIATURE_RAILWAY_INSET_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 4,
SPR_G2_MINIATURE_RAILWAY_INSET_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 5,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 6,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 7,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW = SPR_G2_MINIATURE_RAILWAY_BEGIN + 8,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW = SPR_G2_MINIATURE_RAILWAY_BEGIN + 9,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 10,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 11,
SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE,
SPR_G2_SEARCH,
@ -1021,87 +1048,88 @@ enum
SPR_G2_ARROW_DOWN,
SPR_G2_RELOAD,
// G2 Characters
SPR_G2_CHAR_BEGIN,
SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN + 0,
SPR_G2_AE_LOWER,
SPR_G2_O_STROKE_UPPER,
SPR_G2_O_STROKE_LOWER,
SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN,
SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,
SPR_G2_O_STROKE_UPPER = SPR_G2_CHAR_BEGIN + 2,
SPR_G2_O_STROKE_LOWER = SPR_G2_CHAR_BEGIN + 3,
SPR_G2_CYRILLIC_BE_UPPER,
SPR_G2_CYRILLIC_GHE_UPPER,
SPR_G2_CYRILLIC_DE_UPPER,
SPR_G2_CYRILLIC_ZHE_UPPER,
SPR_G2_CYRILLIC_ZE_UPPER,
SPR_G2_CYRILLIC_I_UPPER,
SPR_G2_CYRILLIC_SHORT_I_UPPER,
SPR_G2_CYRILLIC_EL_UPPER,
SPR_G2_CYRILLIC_PE_UPPER,
SPR_G2_CYRILLIC_U_UPPER,
SPR_G2_CYRILLIC_EF_UPPER,
SPR_G2_CYRILLIC_TSE_UPPER,
SPR_G2_CYRILLIC_CHE_UPPER,
SPR_G2_CYRILLIC_SHA_UPPER,
SPR_G2_CYRILLIC_SHCHA_UPPER,
SPR_G2_CYRILLIC_HARD_SIGN_UPPER,
SPR_G2_CYRILLIC_YERU_UPPER,
SPR_G2_CYRILLIC_SOFT_SIGN_UPPER,
SPR_G2_CYRILLIC_E_UPPER,
SPR_G2_CYRILLIC_YU_UPPER,
SPR_G2_CYRILLIC_YA_UPPER,
SPR_G2_CYRILLIC_BE_UPPER = SPR_G2_CHAR_BEGIN + 4,
SPR_G2_CYRILLIC_GHE_UPPER = SPR_G2_CHAR_BEGIN + 5,
SPR_G2_CYRILLIC_DE_UPPER = SPR_G2_CHAR_BEGIN + 6,
SPR_G2_CYRILLIC_ZHE_UPPER = SPR_G2_CHAR_BEGIN + 7,
SPR_G2_CYRILLIC_ZE_UPPER = SPR_G2_CHAR_BEGIN + 8,
SPR_G2_CYRILLIC_I_UPPER = SPR_G2_CHAR_BEGIN + 9,
SPR_G2_CYRILLIC_SHORT_I_UPPER = SPR_G2_CHAR_BEGIN + 10,
SPR_G2_CYRILLIC_EL_UPPER = SPR_G2_CHAR_BEGIN + 11,
SPR_G2_CYRILLIC_PE_UPPER = SPR_G2_CHAR_BEGIN + 12,
SPR_G2_CYRILLIC_U_UPPER = SPR_G2_CHAR_BEGIN + 13,
SPR_G2_CYRILLIC_EF_UPPER = SPR_G2_CHAR_BEGIN + 14,
SPR_G2_CYRILLIC_TSE_UPPER = SPR_G2_CHAR_BEGIN + 15,
SPR_G2_CYRILLIC_CHE_UPPER = SPR_G2_CHAR_BEGIN + 16,
SPR_G2_CYRILLIC_SHA_UPPER = SPR_G2_CHAR_BEGIN + 17,
SPR_G2_CYRILLIC_SHCHA_UPPER = SPR_G2_CHAR_BEGIN + 18,
SPR_G2_CYRILLIC_HARD_SIGN_UPPER = SPR_G2_CHAR_BEGIN + 19,
SPR_G2_CYRILLIC_YERU_UPPER = SPR_G2_CHAR_BEGIN + 20,
SPR_G2_CYRILLIC_SOFT_SIGN_UPPER = SPR_G2_CHAR_BEGIN + 21,
SPR_G2_CYRILLIC_E_UPPER = SPR_G2_CHAR_BEGIN + 22,
SPR_G2_CYRILLIC_YU_UPPER = SPR_G2_CHAR_BEGIN + 23,
SPR_G2_CYRILLIC_YA_UPPER = SPR_G2_CHAR_BEGIN + 24,
SPR_G2_CYRILLIC_BE_LOWER,
SPR_G2_CYRILLIC_VE_LOWER,
SPR_G2_CYRILLIC_GHE_LOWER,
SPR_G2_CYRILLIC_DE_LOWER,
SPR_G2_CYRILLIC_ZHE_LOWER,
SPR_G2_CYRILLIC_ZE_LOWER,
SPR_G2_CYRILLIC_I_LOWER,
SPR_G2_CYRILLIC_SHORT_I_LOWER,
SPR_G2_CYRILLIC_KA_LOWER,
SPR_G2_CYRILLIC_EL_LOWER,
SPR_G2_CYRILLIC_EM_LOWER,
SPR_G2_CYRILLIC_EN_LOWER,
SPR_G2_CYRILLIC_PE_LOWER,
SPR_G2_CYRILLIC_TE_LOWER,
SPR_G2_CYRILLIC_EF_LOWER,
SPR_G2_CYRILLIC_TSE_LOWER,
SPR_G2_CYRILLIC_CHE_LOWER,
SPR_G2_CYRILLIC_SHA_LOWER,
SPR_G2_CYRILLIC_SHCHA_LOWER,
SPR_G2_CYRILLIC_YERU_LOWER,
SPR_G2_CYRILLIC_SOFT_SIGN_LOWER,
SPR_G2_CYRILLIC_E_LOWER,
SPR_G2_CYRILLIC_YU_LOWER,
SPR_G2_CYRILLIC_YA_LOWER,
SPR_G2_CYRILLIC_BE_LOWER = SPR_G2_CHAR_BEGIN + 25,
SPR_G2_CYRILLIC_VE_LOWER = SPR_G2_CHAR_BEGIN + 26,
SPR_G2_CYRILLIC_GHE_LOWER = SPR_G2_CHAR_BEGIN + 27,
SPR_G2_CYRILLIC_DE_LOWER = SPR_G2_CHAR_BEGIN + 28,
SPR_G2_CYRILLIC_ZHE_LOWER = SPR_G2_CHAR_BEGIN + 29,
SPR_G2_CYRILLIC_ZE_LOWER = SPR_G2_CHAR_BEGIN + 30,
SPR_G2_CYRILLIC_I_LOWER = SPR_G2_CHAR_BEGIN + 31,
SPR_G2_CYRILLIC_SHORT_I_LOWER = SPR_G2_CHAR_BEGIN + 32,
SPR_G2_CYRILLIC_KA_LOWER = SPR_G2_CHAR_BEGIN + 33,
SPR_G2_CYRILLIC_EL_LOWER = SPR_G2_CHAR_BEGIN + 34,
SPR_G2_CYRILLIC_EM_LOWER = SPR_G2_CHAR_BEGIN + 35,
SPR_G2_CYRILLIC_EN_LOWER = SPR_G2_CHAR_BEGIN + 36,
SPR_G2_CYRILLIC_PE_LOWER = SPR_G2_CHAR_BEGIN + 37,
SPR_G2_CYRILLIC_TE_LOWER = SPR_G2_CHAR_BEGIN + 38,
SPR_G2_CYRILLIC_EF_LOWER = SPR_G2_CHAR_BEGIN + 39,
SPR_G2_CYRILLIC_TSE_LOWER = SPR_G2_CHAR_BEGIN + 40,
SPR_G2_CYRILLIC_CHE_LOWER = SPR_G2_CHAR_BEGIN + 41,
SPR_G2_CYRILLIC_SHA_LOWER = SPR_G2_CHAR_BEGIN + 42,
SPR_G2_CYRILLIC_SHCHA_LOWER = SPR_G2_CHAR_BEGIN + 43,
SPR_G2_CYRILLIC_YERU_LOWER = SPR_G2_CHAR_BEGIN + 44,
SPR_G2_CYRILLIC_SOFT_SIGN_LOWER = SPR_G2_CHAR_BEGIN + 45,
SPR_G2_CYRILLIC_E_LOWER = SPR_G2_CHAR_BEGIN + 46,
SPR_G2_CYRILLIC_YU_LOWER = SPR_G2_CHAR_BEGIN + 47,
SPR_G2_CYRILLIC_YA_LOWER = SPR_G2_CHAR_BEGIN + 48,
SPR_G2_GERMAN_OPENQUOTES,
SPR_G2_GERMAN_OPENQUOTES = SPR_G2_CHAR_BEGIN + 49,
SPR_G2_GUILDER_SIGN,
SPR_G2_GUILDER_SIGN = SPR_G2_CHAR_BEGIN + 50,
SPR_G2_G_BREVE_UPPER,
SPR_G2_I_WITH_DOT_UPPER,
SPR_G2_S_CEDILLA_UPPER,
SPR_G2_G_BREVE_LOWER,
SPR_G2_I_WITHOUT_DOT_LOWER,
SPR_G2_S_CEDILLA_LOWER,
SPR_G2_G_BREVE_UPPER = SPR_G2_CHAR_BEGIN + 51,
SPR_G2_I_WITH_DOT_UPPER = SPR_G2_CHAR_BEGIN + 52,
SPR_G2_S_CEDILLA_UPPER = SPR_G2_CHAR_BEGIN + 53,
SPR_G2_G_BREVE_LOWER = SPR_G2_CHAR_BEGIN + 54,
SPR_G2_I_WITHOUT_DOT_LOWER = SPR_G2_CHAR_BEGIN + 55,
SPR_G2_S_CEDILLA_LOWER = SPR_G2_CHAR_BEGIN + 56,
SPR_G2_INTERPUNCT,
SPR_G2_INTERPUNCT = SPR_G2_CHAR_BEGIN + 57,
SPR_G2_A_BREVE_UPPER,
SPR_G2_T_COMMA_UPPER,
SPR_G2_T_COMMA_LOWER,
SPR_G2_A_BREVE_UPPER = SPR_G2_CHAR_BEGIN + 58,
SPR_G2_T_COMMA_UPPER = SPR_G2_CHAR_BEGIN + 59,
SPR_G2_T_COMMA_LOWER = SPR_G2_CHAR_BEGIN + 60,
SPR_G2_ELLIPSIS,
SPR_G2_ELLIPSIS = SPR_G2_CHAR_BEGIN + 61,
SPR_G2_C_CARON_UPPER,
SPR_G2_C_CARON_LOWER,
SPR_G2_C_CARON_UPPER = SPR_G2_CHAR_BEGIN + 62,
SPR_G2_C_CARON_LOWER = SPR_G2_CHAR_BEGIN + 63,
SPR_G2_Y_ACUTE_UPPER,
SPR_G2_Y_ACUTE_LOWER,
SPR_G2_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64,
SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65,
SPR_G2_O_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 66,
SPR_G2_O_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 67,
SPR_G2_O_DOUBLE_ACUTE_UPPER,
SPR_G2_O_DOUBLE_ACUTE_LOWER,
SPR_G2_OE_UPPER,
SPR_G2_OE_LOWER,
@ -1154,6 +1182,8 @@ enum
SPR_G2_GLYPH_COUNT = (SPR_G2_EYE - SPR_G2_CHAR_BEGIN) + 1,
SPR_G2_CHAR_END = SPR_G2_CHAR_BEGIN + SPR_G2_GLYPH_COUNT * 3,
// G2 New track types
SPR_G2_SUPPORT_BEGIN = SPR_G2_CHAR_END,
SPR_G2_SUPPORT_END = SPR_G2_SUPPORT_BEGIN + 32,