mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove magic numbers and Americanisms
This commit is contained in:
Michael Steenbeek
GitHub
parent
bccedd3b1f
commit
a53b01d5b9
|
|
@ -136,9 +136,9 @@ const rct_string_id PeepThoughts[] = {
|
|||
STR_PEEP_THOUGHT_TYPE_UMBRELLA,
|
||||
STR_PEEP_THOUGHT_TYPE_DRINK,
|
||||
STR_PEEP_THOUGHT_TYPE_BURGER,
|
||||
STR_PEEP_THOUGHT_TYPE_FRIES,
|
||||
STR_PEEP_THOUGHT_TYPE_CHIPS,
|
||||
STR_PEEP_THOUGHT_TYPE_ICE_CREAM,
|
||||
STR_PEEP_THOUGHT_TYPE_COTTON_CANDY,
|
||||
STR_PEEP_THOUGHT_TYPE_CANDYFLOSS,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
|
|
@ -170,9 +170,9 @@ const rct_string_id PeepThoughts[] = {
|
|||
STR_PEEP_THOUGHT_TYPE_UMBRELLA_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_DRINK_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_BURGER_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_FRIES_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_CHIPS_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_ICE_CREAM_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_COTTON_CANDY_MUCH,
|
||||
STR_PEEP_THOUGHT_TYPE_CANDYFLOSS_MUCH,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
|
|
|
|||
|
|
@ -509,7 +509,7 @@ enum {
|
|||
STR_RIDE_MODE_UNLIMITED_RIDES_PER_ADMISSION = 1071,
|
||||
STR_RIDE_MODE_MAZE = 1072,
|
||||
STR_RIDE_MODE_RACE = 1073,
|
||||
STR_RIDE_MODE_BUMPER_CAR = 1074,
|
||||
STR_RIDE_MODE_DODGEMS = 1074,
|
||||
STR_RIDE_MODE_SWING = 1075,
|
||||
STR_RIDE_MODE_SHOP_STALL = 1076,
|
||||
STR_RIDE_MODE_ROTATION = 1077,
|
||||
|
|
@ -960,9 +960,9 @@ enum {
|
|||
STR_PEEP_THOUGHT_TYPE_UMBRELLA = 1522,
|
||||
STR_PEEP_THOUGHT_TYPE_DRINK = 1523,
|
||||
STR_PEEP_THOUGHT_TYPE_BURGER = 1524,
|
||||
STR_PEEP_THOUGHT_TYPE_FRIES = 1525,
|
||||
STR_PEEP_THOUGHT_TYPE_CHIPS = 1525,
|
||||
STR_PEEP_THOUGHT_TYPE_ICE_CREAM = 1526,
|
||||
STR_PEEP_THOUGHT_TYPE_COTTON_CANDY = 1527,
|
||||
STR_PEEP_THOUGHT_TYPE_CANDYFLOSS = 1527,
|
||||
// STR_1528 :
|
||||
// STR_1529 :
|
||||
// STR_1530 :
|
||||
|
|
@ -994,9 +994,9 @@ enum {
|
|||
STR_PEEP_THOUGHT_TYPE_UMBRELLA_MUCH = 1556,
|
||||
STR_PEEP_THOUGHT_TYPE_DRINK_MUCH = 1557,
|
||||
STR_PEEP_THOUGHT_TYPE_BURGER_MUCH = 1558,
|
||||
STR_PEEP_THOUGHT_TYPE_FRIES_MUCH = 1559,
|
||||
STR_PEEP_THOUGHT_TYPE_CHIPS_MUCH = 1559,
|
||||
STR_PEEP_THOUGHT_TYPE_ICE_CREAM_MUCH = 1560,
|
||||
STR_PEEP_THOUGHT_TYPE_COTTON_CANDY_MUCH = 1561,
|
||||
STR_PEEP_THOUGHT_TYPE_CANDYFLOSS_MUCH = 1561,
|
||||
// STR_1562 :
|
||||
// STR_1563 :
|
||||
// STR_1564 :
|
||||
|
|
|
|||
|
|
@ -1176,11 +1176,10 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
|
|||
rct2_peep_spawn * spawn = &gPeepSpawns[i];
|
||||
|
||||
if ((spawn->x & 0xFFE0) == pos.x && (spawn->y & 0xFFE0) == pos.y) {
|
||||
// TODO: SPR_TERRAIN_SELECTION_SQUARE_SIMPLE ??? (no variations)
|
||||
sub_98196C(2624, 0, 0, 32, 32, 16, spawn->z * 16, rotation);
|
||||
sub_98196C(SPR_TERRAIN_SELECTION_SQUARE_SIMPLE, 0, 0, 32, 32, 16, spawn->z * 16, rotation);
|
||||
|
||||
sint32 offset = ((spawn->direction ^ 2) + rotation) & 3;
|
||||
uint32 image_id = (3111 + offset) | 0x20380000;
|
||||
uint32 image_id = (PEEP_SPAWN_ARROW_0 + offset) | 0x20380000;
|
||||
sub_98196C(image_id, 0, 0, 32, 32, 19, spawn->z * 16, rotation);
|
||||
}
|
||||
}
|
||||
|
|
@ -1190,13 +1189,12 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
|
|||
// loc_660E9A:
|
||||
if (mapElement->properties.surface.ownership & OWNERSHIP_OWNED) {
|
||||
assert(surfaceShape < countof(byte_97B444));
|
||||
// TODO: SPR_TERRAIN_SELECTION_SQUARE?
|
||||
paint_attach_to_previous_ps(2625 + byte_97B444[surfaceShape], 0, 0);
|
||||
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_SQUARE + byte_97B444[surfaceShape], 0, 0);
|
||||
} else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) {
|
||||
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
|
||||
paint_struct * backup = g_ps_F1AD28;
|
||||
sint32 height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3;
|
||||
sub_98196C(22955, 16, 16, 1, 1, 0, height2, rotation);
|
||||
sub_98196C(SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2, rotation);
|
||||
g_ps_F1AD28 = backup;
|
||||
}
|
||||
}
|
||||
|
|
@ -1205,13 +1203,12 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
|
|||
&& !(mapElement->properties.surface.ownership & OWNERSHIP_OWNED)) {
|
||||
if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED) {
|
||||
assert(surfaceShape < countof(byte_97B444));
|
||||
// TODO: SPR_TERRAIN_SELECTION_DOTTED ???
|
||||
paint_attach_to_previous_ps(2644 + byte_97B444[surfaceShape], 0, 0);
|
||||
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_DOTTED + byte_97B444[surfaceShape], 0, 0);
|
||||
} else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) {
|
||||
paint_struct * backup = g_ps_F1AD28;
|
||||
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
|
||||
sint32 height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF;
|
||||
sub_98196C(22956, 16, 16, 1, 1, 0, height2 + 3, rotation);
|
||||
sub_98196C(SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3, rotation);
|
||||
g_ps_F1AD28 = backup;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -750,9 +750,9 @@ static const uint8 byte_9822F4[] = {
|
|||
0, // SHOP_ITEM_UMBRELLA
|
||||
100, // SHOP_ITEM_DRINK
|
||||
150, // SHOP_ITEM_BURGER
|
||||
120, // SHOP_ITEM_FRIES
|
||||
120, // SHOP_ITEM_CHIPS
|
||||
60, // SHOP_ITEM_ICE_CREAM
|
||||
50, // SHOP_ITEM_COTTON_CANDY
|
||||
50, // SHOP_ITEM_CANDYFLOSS
|
||||
0, // SHOP_ITEM_EMPTY_CAN
|
||||
0, // SHOP_ITEM_RUBBISH
|
||||
0, // SHOP_ITEM_EMPTY_BURGER_BOX
|
||||
|
|
@ -828,9 +828,9 @@ static const uint8 peep_item_containers[] = {
|
|||
0xFF, // PEEP_ITEM_UMBRELLA
|
||||
SHOP_ITEM_EMPTY_CAN, // PEEP_ITEM_DRINK
|
||||
SHOP_ITEM_EMPTY_BURGER_BOX, // PEEP_ITEM_BURGER
|
||||
SHOP_ITEM_RUBBISH, // PEEP_ITEM_FRIES
|
||||
SHOP_ITEM_RUBBISH, // PEEP_ITEM_CHIPS
|
||||
0xFF, // PEEP_ITEM_ICE_CREAM
|
||||
0xFF, // PEEP_ITEM_COTTON_CANDY
|
||||
0xFF, // PEEP_ITEM_CANDYFLOSS
|
||||
0xFF, // PEEP_ITEM_EMPTY_CAN
|
||||
0xFF, // PEEP_ITEM_RUBBISH
|
||||
0xFF, // PEEP_ITEM_EMPTY_BURGER_BOX
|
||||
|
|
@ -1677,14 +1677,14 @@ typedef struct item_pref_t {
|
|||
|
||||
item_pref_t item_order_preference[] = {
|
||||
{ 0, PEEP_ITEM_ICE_CREAM, PEEP_SPRITE_TYPE_ICE_CREAM },
|
||||
{ 0, PEEP_ITEM_FRIES, PEEP_SPRITE_TYPE_FRIES },
|
||||
{ 0, PEEP_ITEM_CHIPS, PEEP_SPRITE_TYPE_CHIPS },
|
||||
{ 0, PEEP_ITEM_PIZZA, PEEP_SPRITE_TYPE_PIZZA },
|
||||
{ 0, PEEP_ITEM_BURGER, PEEP_SPRITE_TYPE_BURGER },
|
||||
{ 0, PEEP_ITEM_DRINK, PEEP_SPRITE_TYPE_DRINK },
|
||||
{ 0, PEEP_ITEM_COFFEE, PEEP_SPRITE_TYPE_COFFEE },
|
||||
{ 0, PEEP_ITEM_CHICKEN, PEEP_SPRITE_TYPE_CHICKEN },
|
||||
{ 0, PEEP_ITEM_LEMONADE, PEEP_SPRITE_TYPE_LEMONADE },
|
||||
{ 0, PEEP_ITEM_COTTON_CANDY, PEEP_SPRITE_TYPE_CANDYFLOSS },
|
||||
{ 0, PEEP_ITEM_CANDYFLOSS, PEEP_SPRITE_TYPE_CANDYFLOSS },
|
||||
{ 0, PEEP_ITEM_POPCORN, PEEP_SPRITE_TYPE_PIZZA },
|
||||
{ 0, PEEP_ITEM_HOT_DOG, PEEP_SPRITE_TYPE_HOT_DOG },
|
||||
{ 0, PEEP_ITEM_TENTACLE, PEEP_SPRITE_TYPE_TENTACLE },
|
||||
|
|
@ -4886,7 +4886,7 @@ static void peep_update_queuing(rct_peep* peep){
|
|||
if (!(peep->time_in_queue & 0x3F) && peep->action == 0xFE && peep->next_action_sprite_type == 2){
|
||||
switch (peep->sprite_type) {
|
||||
case PEEP_SPRITE_TYPE_ICE_CREAM:
|
||||
case PEEP_SPRITE_TYPE_FRIES:
|
||||
case PEEP_SPRITE_TYPE_CHIPS:
|
||||
case PEEP_SPRITE_TYPE_BURGER:
|
||||
case PEEP_SPRITE_TYPE_DRINK:
|
||||
case PEEP_SPRITE_TYPE_CANDYFLOSS:
|
||||
|
|
@ -4980,7 +4980,7 @@ static void peep_update_mowing(rct_peep* peep){
|
|||
for (; (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SURFACE); map_element++);
|
||||
|
||||
if ((map_element->properties.surface.terrain & MAP_ELEMENT_SURFACE_TERRAIN_MASK) == (TERRAIN_GRASS << 5)){
|
||||
map_element->properties.surface.grass_length = 0;
|
||||
map_element->properties.surface.grass_length = GRASS_LENGTH_MOWED;
|
||||
map_invalidate_tile_zoom0(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->base_height * 8 + 16);
|
||||
}
|
||||
peep->staff_lawns_mown++;
|
||||
|
|
@ -5659,9 +5659,9 @@ static const uint8 item_standard_litter[32] = {
|
|||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_UMBRELLA
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_DRINK
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_BURGER
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_FRIES
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_CHIPS
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_ICE_CREAM
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_COTTON_CANDY
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_CANDYFLOSS
|
||||
LITTER_TYPE_EMPTY_CAN, // PEEP_ITEM_EMPTY_CAN
|
||||
LITTER_TYPE_RUBBISH, // PEEP_ITEM_RUBBISH
|
||||
LITTER_TYPE_EMPTY_BURGER_BOX, // PEEP_ITEM_EMPTY_BURGER_BOX
|
||||
|
|
@ -7603,9 +7603,9 @@ static sint32 peep_has_food_standard_flag(rct_peep* peep){
|
|||
return peep->item_standard_flags &(
|
||||
PEEP_ITEM_DRINK |
|
||||
PEEP_ITEM_BURGER |
|
||||
PEEP_ITEM_FRIES |
|
||||
PEEP_ITEM_CHIPS |
|
||||
PEEP_ITEM_ICE_CREAM |
|
||||
PEEP_ITEM_COTTON_CANDY |
|
||||
PEEP_ITEM_CANDYFLOSS |
|
||||
PEEP_ITEM_PIZZA |
|
||||
PEEP_ITEM_POPCORN |
|
||||
PEEP_ITEM_HOT_DOG |
|
||||
|
|
@ -10932,7 +10932,7 @@ static bool sub_69AF1E(rct_peep *peep, sint32 rideIndex, sint32 shopItem, money3
|
|||
}
|
||||
|
||||
if ((shopItem == SHOP_ITEM_BALLOON) || (shopItem == SHOP_ITEM_ICE_CREAM)
|
||||
|| (shopItem == SHOP_ITEM_COTTON_CANDY) || (shopItem == SHOP_ITEM_SUNGLASSES)) {
|
||||
|| (shopItem == SHOP_ITEM_CANDYFLOSS) || (shopItem == SHOP_ITEM_SUNGLASSES)) {
|
||||
if (gClimateCurrentRainLevel != 0)
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,9 +82,9 @@ enum PEEP_THOUGHT_TYPE {
|
|||
PEEP_THOUGHT_TYPE_UMBRELLA = 42,
|
||||
PEEP_THOUGHT_TYPE_DRINK = 43,
|
||||
PEEP_THOUGHT_TYPE_BURGER = 44,
|
||||
PEEP_THOUGHT_TYPE_FRIES = 45,
|
||||
PEEP_THOUGHT_TYPE_CHIPS = 45,
|
||||
PEEP_THOUGHT_TYPE_ICE_CREAM = 46,
|
||||
PEEP_THOUGHT_TYPE_COTTON_CANDY = 47,
|
||||
PEEP_THOUGHT_TYPE_CANDYFLOSS = 47,
|
||||
|
||||
PEEP_THOUGHT_TYPE_PIZZA = 51,
|
||||
|
||||
|
|
@ -111,9 +111,9 @@ enum PEEP_THOUGHT_TYPE {
|
|||
PEEP_THOUGHT_TYPE_UMBRELLA_MUCH = 76,
|
||||
PEEP_THOUGHT_TYPE_DRINK_MUCH = 77,
|
||||
PEEP_THOUGHT_TYPE_BURGER_MUCH = 78,
|
||||
PEEP_THOUGHT_TYPE_FRIES_MUCH = 79,
|
||||
PEEP_THOUGHT_TYPE_CHIPS_MUCH = 79,
|
||||
PEEP_THOUGHT_TYPE_ICE_CREAM_MUCH = 80,
|
||||
PEEP_THOUGHT_TYPE_COTTON_CANDY_MUCH = 81,
|
||||
PEEP_THOUGHT_TYPE_CANDYFLOSS_MUCH = 81,
|
||||
|
||||
PEEP_THOUGHT_TYPE_PIZZA_MUCH = 85,
|
||||
|
||||
|
|
@ -334,9 +334,9 @@ enum PEEP_ITEM {
|
|||
PEEP_ITEM_UMBRELLA = (1 << 4),
|
||||
PEEP_ITEM_DRINK = (1 << 5),
|
||||
PEEP_ITEM_BURGER = (1 << 6),
|
||||
PEEP_ITEM_FRIES = (1 << 7),
|
||||
PEEP_ITEM_CHIPS = (1 << 7),
|
||||
PEEP_ITEM_ICE_CREAM = (1 << 8),
|
||||
PEEP_ITEM_COTTON_CANDY = (1 << 9),
|
||||
PEEP_ITEM_CANDYFLOSS = (1 << 9),
|
||||
PEEP_ITEM_EMPTY_CAN = (1 << 10),
|
||||
PEEP_ITEM_RUBBISH = (1 << 11),
|
||||
PEEP_ITEM_EMPTY_BURGER_BOX = (1 << 12),
|
||||
|
|
@ -398,7 +398,7 @@ enum PEEP_SPRITE_TYPE {
|
|||
PEEP_SPRITE_TYPE_ENTERTAINER_SHERIFF = 13,
|
||||
PEEP_SPRITE_TYPE_ENTERTAINER_PIRATE = 14,
|
||||
PEEP_SPRITE_TYPE_ICE_CREAM = 15,
|
||||
PEEP_SPRITE_TYPE_FRIES = 16,
|
||||
PEEP_SPRITE_TYPE_CHIPS = 16,
|
||||
PEEP_SPRITE_TYPE_BURGER = 17,
|
||||
PEEP_SPRITE_TYPE_DRINK = 18,
|
||||
PEEP_SPRITE_TYPE_BALLOON = 19,
|
||||
|
|
|
|||
|
|
@ -624,43 +624,43 @@ static const uint8 PeepSpriteImage_IceCream_34_sequence[] = { 0, 1, 2, 3, 4, 5,
|
|||
static const uint8 PeepSpriteImage_IceCream_35_sequence[] = { 0, 1, 2, 2, 2, 2, 3, 4, 5, 5, 5, 5, 4 };
|
||||
static const uint8 PeepSpriteImage_IceCream_36_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11, 12, 11, 12, 11, 12, 11, 12, 11, 11, 11, 11, 11, 13, 14, 15 };
|
||||
|
||||
static const uint8 PeepSpriteImage_Fries_00_sequence[] = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
|
||||
static const uint8 PeepSpriteImage_Fries_01_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8 };
|
||||
static const uint8 PeepSpriteImage_Fries_02_sequence[] = { 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_03_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Fries_04_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
|
||||
static const uint8 PeepSpriteImage_Fries_05_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
|
||||
static const uint8 PeepSpriteImage_Fries_06_sequence[] = { 0, 1, 2, 3, 4, 5 };
|
||||
static const uint8 PeepSpriteImage_Fries_07_sequence[] = { 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_08_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Fries_09_sequence[] = { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_10_sequence[] = { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_11_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Fries_12_sequence[] = { 0, 1, 2, 3, 4, 5 };
|
||||
static const uint8 PeepSpriteImage_Fries_13_sequence[] = { 0, 1, 2, 3, 4, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_14_sequence[] = { 8, 8, 9, 9, 10, 10, 9, 9, 8, 8, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 14, 13, 13, 8, 8, 9, 9, 8, 8 };
|
||||
static const uint8 PeepSpriteImage_Fries_15_sequence[] = { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11 };
|
||||
static const uint8 PeepSpriteImage_Fries_16_sequence[] = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4 };
|
||||
static const uint8 PeepSpriteImage_Fries_17_sequence[] = { 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 5, 6, 7 };
|
||||
static const uint8 PeepSpriteImage_Fries_18_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 17, 18, 18, 18, 18, 18, 18, 18, 17, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_19_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_20_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 9, 8, 14, 15, 15, 15, 16, 17, 17, 17, 14, 11, 12, 13, 12, 13, 12, 11, 9, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_21_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_22_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 22, 21, 20, 21, 22, 21, 20, 21, 22, 20, 21, 22, 21, 20, 19, 18, 0, 0, 23, 24, 25, 26, 27, 28, 28, 26, 24, 29, 30, 31, 32, 31, 30, 31, 32, 31, 30, 31, 32, 31, 30, 29, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_23_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_24_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 22, 21, 20, 21, 22, 21, 20, 21, 22, 20, 19, 18, 0, 0, 23, 24, 25, 26, 27, 28, 28, 26, 24, 0, 0, 0, 0, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_25_sequence[] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_26_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
|
||||
static const uint8 PeepSpriteImage_Fries_27_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 11, 12, 11, 10, 10, 10, 13, 14, 14, 14, 13, 10, 10, 10, 11, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_28_sequence[] = { 0, 1, 2, 3, 3, 4, 4, 3, 3, 4, 4, 3, 3, 4, 4, 3, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_29_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_30_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 5, 4, 5, 6, 5, 4, 5, 6, 5, 4, 5, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_31_sequence[] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 6, 7, 6, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_32_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_33_sequence[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_34_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Fries_35_sequence[] = { 0, 1, 2, 2, 2, 2, 3, 4, 5, 5, 5, 5, 4 };
|
||||
static const uint8 PeepSpriteImage_Fries_36_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11, 12, 11, 12, 11, 12, 11, 12, 11, 11, 11, 11, 11, 13, 14, 15 };
|
||||
static const uint8 PeepSpriteImage_Chips_00_sequence[] = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
|
||||
static const uint8 PeepSpriteImage_Chips_01_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8 };
|
||||
static const uint8 PeepSpriteImage_Chips_02_sequence[] = { 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_03_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Chips_04_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
|
||||
static const uint8 PeepSpriteImage_Chips_05_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
|
||||
static const uint8 PeepSpriteImage_Chips_06_sequence[] = { 0, 1, 2, 3, 4, 5 };
|
||||
static const uint8 PeepSpriteImage_Chips_07_sequence[] = { 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_08_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Chips_09_sequence[] = { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_10_sequence[] = { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_11_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
static const uint8 PeepSpriteImage_Chips_12_sequence[] = { 0, 1, 2, 3, 4, 5 };
|
||||
static const uint8 PeepSpriteImage_Chips_13_sequence[] = { 0, 1, 2, 3, 4, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_14_sequence[] = { 8, 8, 9, 9, 10, 10, 9, 9, 8, 8, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 14, 13, 13, 8, 8, 9, 9, 8, 8 };
|
||||
static const uint8 PeepSpriteImage_Chips_15_sequence[] = { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11 };
|
||||
static const uint8 PeepSpriteImage_Chips_16_sequence[] = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4 };
|
||||
static const uint8 PeepSpriteImage_Chips_17_sequence[] = { 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0, 5, 6, 7 };
|
||||
static const uint8 PeepSpriteImage_Chips_18_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 17, 18, 18, 18, 18, 18, 18, 18, 17, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_19_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_20_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 9, 8, 14, 15, 15, 15, 16, 17, 17, 17, 14, 11, 12, 13, 12, 13, 12, 11, 9, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_21_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_22_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 22, 21, 20, 21, 22, 21, 20, 21, 22, 20, 21, 22, 21, 20, 19, 18, 0, 0, 23, 24, 25, 26, 27, 28, 28, 26, 24, 29, 30, 31, 32, 31, 30, 31, 32, 31, 30, 31, 32, 31, 30, 29, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_23_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_24_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 22, 21, 20, 21, 22, 21, 20, 21, 22, 20, 19, 18, 0, 0, 23, 24, 25, 26, 27, 28, 28, 26, 24, 0, 0, 0, 0, 0, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_25_sequence[] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_26_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
|
||||
static const uint8 PeepSpriteImage_Chips_27_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 11, 12, 11, 10, 10, 10, 13, 14, 14, 14, 13, 10, 10, 10, 11, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_28_sequence[] = { 0, 1, 2, 3, 3, 4, 4, 3, 3, 4, 4, 3, 3, 4, 4, 3, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_29_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_30_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 5, 4, 5, 6, 5, 4, 5, 6, 5, 4, 5, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_31_sequence[] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 6, 7, 6, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_32_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 6, 7, 8, 7, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_33_sequence[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_34_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13, 7, 6, 5, 4, 3, 2, 1, 0 };
|
||||
static const uint8 PeepSpriteImage_Chips_35_sequence[] = { 0, 1, 2, 2, 2, 2, 3, 4, 5, 5, 5, 5, 4 };
|
||||
static const uint8 PeepSpriteImage_Chips_36_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11, 12, 11, 12, 11, 12, 11, 12, 11, 11, 11, 11, 11, 13, 14, 15 };
|
||||
|
||||
static const uint8 PeepSpriteImage_Burger_00_sequence[] = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
|
||||
static const uint8 PeepSpriteImage_Burger_01_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8 };
|
||||
|
|
@ -2481,44 +2481,44 @@ static const rct_peep_animation PeepSpriteImage_IceCream[] = {
|
|||
{ 7181, countof(PeepSpriteImage_IceCream_36_sequence), PeepSpriteImage_IceCream_36_sequence },
|
||||
};
|
||||
|
||||
static const rct_peep_animation PeepSpriteImage_Fries[] = {
|
||||
{ 7609, countof(PeepSpriteImage_Fries_00_sequence), PeepSpriteImage_Fries_00_sequence },
|
||||
{ 6585, countof(PeepSpriteImage_Fries_01_sequence), PeepSpriteImage_Fries_01_sequence },
|
||||
{ 7605, countof(PeepSpriteImage_Fries_02_sequence), PeepSpriteImage_Fries_02_sequence },
|
||||
{ 7733, countof(PeepSpriteImage_Fries_03_sequence), PeepSpriteImage_Fries_03_sequence },
|
||||
{ 6697, countof(PeepSpriteImage_Fries_04_sequence), PeepSpriteImage_Fries_04_sequence },
|
||||
{ 6757, countof(PeepSpriteImage_Fries_05_sequence), PeepSpriteImage_Fries_05_sequence },
|
||||
{ 6561, countof(PeepSpriteImage_Fries_06_sequence), PeepSpriteImage_Fries_06_sequence },
|
||||
{ 7681, countof(PeepSpriteImage_Fries_07_sequence), PeepSpriteImage_Fries_07_sequence },
|
||||
{ 7685, countof(PeepSpriteImage_Fries_08_sequence), PeepSpriteImage_Fries_08_sequence },
|
||||
{ 6637, countof(PeepSpriteImage_Fries_09_sequence), PeepSpriteImage_Fries_09_sequence },
|
||||
{ 6645, countof(PeepSpriteImage_Fries_10_sequence), PeepSpriteImage_Fries_10_sequence },
|
||||
{ 6813, countof(PeepSpriteImage_Fries_11_sequence), PeepSpriteImage_Fries_11_sequence },
|
||||
{ 11301, countof(PeepSpriteImage_Fries_12_sequence), PeepSpriteImage_Fries_12_sequence },
|
||||
{ 6825, countof(PeepSpriteImage_Fries_13_sequence), PeepSpriteImage_Fries_13_sequence },
|
||||
{ 6845, countof(PeepSpriteImage_Fries_14_sequence), PeepSpriteImage_Fries_14_sequence },
|
||||
{ 6909, countof(PeepSpriteImage_Fries_15_sequence), PeepSpriteImage_Fries_15_sequence },
|
||||
{ 11325, countof(PeepSpriteImage_Fries_16_sequence), PeepSpriteImage_Fries_16_sequence },
|
||||
{ 6957, countof(PeepSpriteImage_Fries_17_sequence), PeepSpriteImage_Fries_17_sequence },
|
||||
{ 11513, countof(PeepSpriteImage_Fries_18_sequence), PeepSpriteImage_Fries_18_sequence },
|
||||
{ 11513, countof(PeepSpriteImage_Fries_19_sequence), PeepSpriteImage_Fries_19_sequence },
|
||||
{ 11597, countof(PeepSpriteImage_Fries_20_sequence), PeepSpriteImage_Fries_20_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Fries_21_sequence), PeepSpriteImage_Fries_21_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Fries_22_sequence), PeepSpriteImage_Fries_22_sequence },
|
||||
{ 11801, countof(PeepSpriteImage_Fries_23_sequence), PeepSpriteImage_Fries_23_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Fries_24_sequence), PeepSpriteImage_Fries_24_sequence },
|
||||
{ 11377, countof(PeepSpriteImage_Fries_25_sequence), PeepSpriteImage_Fries_25_sequence },
|
||||
{ 6989, countof(PeepSpriteImage_Fries_26_sequence), PeepSpriteImage_Fries_26_sequence },
|
||||
{ 7041, countof(PeepSpriteImage_Fries_27_sequence), PeepSpriteImage_Fries_27_sequence },
|
||||
{ 7101, countof(PeepSpriteImage_Fries_28_sequence), PeepSpriteImage_Fries_28_sequence },
|
||||
{ 11401, countof(PeepSpriteImage_Fries_29_sequence), PeepSpriteImage_Fries_29_sequence },
|
||||
{ 7121, countof(PeepSpriteImage_Fries_30_sequence), PeepSpriteImage_Fries_30_sequence },
|
||||
{ 7149, countof(PeepSpriteImage_Fries_31_sequence), PeepSpriteImage_Fries_31_sequence },
|
||||
{ 7249, countof(PeepSpriteImage_Fries_32_sequence), PeepSpriteImage_Fries_32_sequence },
|
||||
{ 7309, countof(PeepSpriteImage_Fries_33_sequence), PeepSpriteImage_Fries_33_sequence },
|
||||
{ 7329, countof(PeepSpriteImage_Fries_34_sequence), PeepSpriteImage_Fries_34_sequence },
|
||||
{ 7285, countof(PeepSpriteImage_Fries_35_sequence), PeepSpriteImage_Fries_35_sequence },
|
||||
{ 7181, countof(PeepSpriteImage_Fries_36_sequence), PeepSpriteImage_Fries_36_sequence },
|
||||
static const rct_peep_animation PeepSpriteImage_Chips[] = {
|
||||
{ 7609, countof(PeepSpriteImage_Chips_00_sequence), PeepSpriteImage_Chips_00_sequence },
|
||||
{ 6585, countof(PeepSpriteImage_Chips_01_sequence), PeepSpriteImage_Chips_01_sequence },
|
||||
{ 7605, countof(PeepSpriteImage_Chips_02_sequence), PeepSpriteImage_Chips_02_sequence },
|
||||
{ 7733, countof(PeepSpriteImage_Chips_03_sequence), PeepSpriteImage_Chips_03_sequence },
|
||||
{ 6697, countof(PeepSpriteImage_Chips_04_sequence), PeepSpriteImage_Chips_04_sequence },
|
||||
{ 6757, countof(PeepSpriteImage_Chips_05_sequence), PeepSpriteImage_Chips_05_sequence },
|
||||
{ 6561, countof(PeepSpriteImage_Chips_06_sequence), PeepSpriteImage_Chips_06_sequence },
|
||||
{ 7681, countof(PeepSpriteImage_Chips_07_sequence), PeepSpriteImage_Chips_07_sequence },
|
||||
{ 7685, countof(PeepSpriteImage_Chips_08_sequence), PeepSpriteImage_Chips_08_sequence },
|
||||
{ 6637, countof(PeepSpriteImage_Chips_09_sequence), PeepSpriteImage_Chips_09_sequence },
|
||||
{ 6645, countof(PeepSpriteImage_Chips_10_sequence), PeepSpriteImage_Chips_10_sequence },
|
||||
{ 6813, countof(PeepSpriteImage_Chips_11_sequence), PeepSpriteImage_Chips_11_sequence },
|
||||
{ 11301, countof(PeepSpriteImage_Chips_12_sequence), PeepSpriteImage_Chips_12_sequence },
|
||||
{ 6825, countof(PeepSpriteImage_Chips_13_sequence), PeepSpriteImage_Chips_13_sequence },
|
||||
{ 6845, countof(PeepSpriteImage_Chips_14_sequence), PeepSpriteImage_Chips_14_sequence },
|
||||
{ 6909, countof(PeepSpriteImage_Chips_15_sequence), PeepSpriteImage_Chips_15_sequence },
|
||||
{ 11325, countof(PeepSpriteImage_Chips_16_sequence), PeepSpriteImage_Chips_16_sequence },
|
||||
{ 6957, countof(PeepSpriteImage_Chips_17_sequence), PeepSpriteImage_Chips_17_sequence },
|
||||
{ 11513, countof(PeepSpriteImage_Chips_18_sequence), PeepSpriteImage_Chips_18_sequence },
|
||||
{ 11513, countof(PeepSpriteImage_Chips_19_sequence), PeepSpriteImage_Chips_19_sequence },
|
||||
{ 11597, countof(PeepSpriteImage_Chips_20_sequence), PeepSpriteImage_Chips_20_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Chips_21_sequence), PeepSpriteImage_Chips_21_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Chips_22_sequence), PeepSpriteImage_Chips_22_sequence },
|
||||
{ 11801, countof(PeepSpriteImage_Chips_23_sequence), PeepSpriteImage_Chips_23_sequence },
|
||||
{ 11669, countof(PeepSpriteImage_Chips_24_sequence), PeepSpriteImage_Chips_24_sequence },
|
||||
{ 11377, countof(PeepSpriteImage_Chips_25_sequence), PeepSpriteImage_Chips_25_sequence },
|
||||
{ 6989, countof(PeepSpriteImage_Chips_26_sequence), PeepSpriteImage_Chips_26_sequence },
|
||||
{ 7041, countof(PeepSpriteImage_Chips_27_sequence), PeepSpriteImage_Chips_27_sequence },
|
||||
{ 7101, countof(PeepSpriteImage_Chips_28_sequence), PeepSpriteImage_Chips_28_sequence },
|
||||
{ 11401, countof(PeepSpriteImage_Chips_29_sequence), PeepSpriteImage_Chips_29_sequence },
|
||||
{ 7121, countof(PeepSpriteImage_Chips_30_sequence), PeepSpriteImage_Chips_30_sequence },
|
||||
{ 7149, countof(PeepSpriteImage_Chips_31_sequence), PeepSpriteImage_Chips_31_sequence },
|
||||
{ 7249, countof(PeepSpriteImage_Chips_32_sequence), PeepSpriteImage_Chips_32_sequence },
|
||||
{ 7309, countof(PeepSpriteImage_Chips_33_sequence), PeepSpriteImage_Chips_33_sequence },
|
||||
{ 7329, countof(PeepSpriteImage_Chips_34_sequence), PeepSpriteImage_Chips_34_sequence },
|
||||
{ 7285, countof(PeepSpriteImage_Chips_35_sequence), PeepSpriteImage_Chips_35_sequence },
|
||||
{ 7181, countof(PeepSpriteImage_Chips_36_sequence), PeepSpriteImage_Chips_36_sequence },
|
||||
};
|
||||
|
||||
static const rct_peep_animation PeepSpriteImage_Burger[] = {
|
||||
|
|
@ -4402,7 +4402,7 @@ static const rct_sprite_bounds PeepSpriteBounds_IceCream[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static const rct_sprite_bounds PeepSpriteBounds_Fries[] = {
|
||||
static const rct_sprite_bounds PeepSpriteBounds_Chips[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5421,7 +5421,7 @@ rct_peep_animation_entry g_peep_animation_entries[] =
|
|||
{ PeepSpriteImage_EntertainerSheriff, PeepSpriteBounds_EntertainerSheriff },
|
||||
{ PeepSpriteImage_EntertainerPirate, PeepSpriteBounds_EntertainerPirate },
|
||||
{ PeepSpriteImage_IceCream, PeepSpriteBounds_IceCream },
|
||||
{ PeepSpriteImage_Fries, PeepSpriteBounds_Fries },
|
||||
{ PeepSpriteImage_Chips, PeepSpriteBounds_Chips },
|
||||
{ PeepSpriteImage_Burger, PeepSpriteBounds_Burger },
|
||||
{ PeepSpriteImage_Drink, PeepSpriteBounds_Drink },
|
||||
{ PeepSpriteImage_Balloon, PeepSpriteBounds_Balloon },
|
||||
|
|
|
|||
|
|
@ -824,9 +824,9 @@ enum {
|
|||
RCT1_RIDE_TYPE_SWINGING_SHIP,
|
||||
RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP,
|
||||
RCT1_RIDE_TYPE_ICE_CREAM_STALL,
|
||||
RCT1_RIDE_TYPE_FRIES_STALL,
|
||||
RCT1_RIDE_TYPE_CHIPS_STALL,
|
||||
RCT1_RIDE_TYPE_DRINK_STALL,
|
||||
RCT1_RIDE_TYPE_COTTON_CANDY_STALL,
|
||||
RCT1_RIDE_TYPE_CANDYFLOSS_STALL,
|
||||
RCT1_RIDE_TYPE_BURGER_BAR,
|
||||
RCT1_RIDE_TYPE_MERRY_GO_ROUND,
|
||||
RCT1_RIDE_TYPE_BALLOON_STALL,
|
||||
|
|
@ -837,7 +837,7 @@ enum {
|
|||
RCT1_RIDE_TYPE_3D_CINEMA,
|
||||
RCT1_RIDE_TYPE_GRAVITRON,
|
||||
RCT1_RIDE_TYPE_SPACE_RINGS,
|
||||
RCT1_RIDE_TYPE_REVERSE_WHOA_BELLY_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_SOUVENIR_STALL,
|
||||
RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_PIZZA_STALL,
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ namespace RCT1
|
|||
PEEP_SPRITE_TYPE_ENTERTAINER_KNIGHT, // 0x0A
|
||||
PEEP_SPRITE_TYPE_ENTERTAINER_ASTRONAUT, // 0x0B
|
||||
PEEP_SPRITE_TYPE_ICE_CREAM, // 0x0C
|
||||
PEEP_SPRITE_TYPE_FRIES, // 0x0D
|
||||
PEEP_SPRITE_TYPE_CHIPS, // 0x0D
|
||||
PEEP_SPRITE_TYPE_BURGER, // 0x0E
|
||||
PEEP_SPRITE_TYPE_DRINK, // 0x0F
|
||||
PEEP_SPRITE_TYPE_BALLOON, // 0x10
|
||||
|
|
@ -373,9 +373,9 @@ namespace RCT1
|
|||
case RCT1_RIDE_TYPE_HEDGE_MAZE:
|
||||
case RCT1_RIDE_TYPE_SPIRAL_SLIDE:
|
||||
case RCT1_RIDE_TYPE_ICE_CREAM_STALL:
|
||||
case RCT1_RIDE_TYPE_FRIES_STALL:
|
||||
case RCT1_RIDE_TYPE_CHIPS_STALL:
|
||||
case RCT1_RIDE_TYPE_DRINK_STALL:
|
||||
case RCT1_RIDE_TYPE_COTTON_CANDY_STALL:
|
||||
case RCT1_RIDE_TYPE_CANDYFLOSS_STALL:
|
||||
case RCT1_RIDE_TYPE_BURGER_BAR:
|
||||
case RCT1_RIDE_TYPE_BALLOON_STALL:
|
||||
case RCT1_RIDE_TYPE_INFORMATION_KIOSK:
|
||||
|
|
@ -722,9 +722,9 @@ namespace RCT1
|
|||
"SWSH1 ", // RCT1_RIDE_TYPE_SWINGING_SHIP
|
||||
"SWSH2 ", // RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP
|
||||
"ICECR1 ", // RCT1_RIDE_TYPE_ICE_CREAM_STALL
|
||||
"CHPSH ", // RCT1_RIDE_TYPE_FRIES_STALL
|
||||
"CHPSH ", // RCT1_RIDE_TYPE_CHIPS_STALL
|
||||
"DRNKS ", // RCT1_RIDE_TYPE_DRINK_STALL
|
||||
"CNDYF ", // RCT1_RIDE_TYPE_COTTON_CANDY_STALL
|
||||
"CNDYF ", // RCT1_RIDE_TYPE_CANDYFLOSS_STALL
|
||||
"BURGB ", // RCT1_RIDE_TYPE_BURGER_BAR
|
||||
"MGR1 ", // RCT1_RIDE_TYPE_MERRY_GO_ROUND
|
||||
"BALLN ", // RCT1_RIDE_TYPE_BALLOON_STALL
|
||||
|
|
@ -735,7 +735,7 @@ namespace RCT1
|
|||
"C3D ", // RCT1_RIDE_TYPE_3D_CINEMA
|
||||
"TOPSP1 ", // RCT1_RIDE_TYPE_GRAVITRON
|
||||
"SRINGS ", // RCT1_RIDE_TYPE_SPACE_RINGS
|
||||
"REVF1 ", // RCT1_RIDE_TYPE_REVERSE_WHOA_BELLY_ROLLER_COASTER
|
||||
"REVF1 ", // RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER
|
||||
"SOUVS ", // RCT1_RIDE_TYPE_SOUVENIR_STALL
|
||||
"BMVD ", // RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER
|
||||
"PIZZS ", // RCT1_RIDE_TYPE_PIZZA_STALL
|
||||
|
|
|
|||
|
|
@ -790,9 +790,9 @@ TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(sint32 tra
|
|||
return air_powered_vertical_rc_track_right_bank;
|
||||
case TRACK_ELEM_BRAKES:
|
||||
return air_powered_vertical_rc_track_brakes;
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_SLOPE:
|
||||
return air_powered_vertical_rc_track_vertical_slope_up;
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_VERTICAL:
|
||||
return air_powered_vertical_rc_track_vertical_up;
|
||||
case TRACK_ELEM_AIR_THRUST_TOP_CAP:
|
||||
return air_powered_vertical_rc_track_vertical_top;
|
||||
|
|
|
|||
|
|
@ -364,9 +364,9 @@ TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(sint32 trackTy
|
|||
case TRACK_ELEM_BEGIN_STATION:
|
||||
case TRACK_ELEM_MIDDLE_STATION:
|
||||
return paint_reverse_freefall_rc_station;
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_SLOPE:
|
||||
return paint_reverse_freefall_rc_slope;
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_VERTICAL:
|
||||
return paint_reverse_freefall_rc_vertical;
|
||||
}
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -4529,7 +4529,7 @@ static rct_vehicle *vehicle_create_car(
|
|||
vehicle->sprite_direction = scenario_rand() & 0x1E;
|
||||
chosenLoc.y = y + (scenario_rand() & 0xFF);
|
||||
chosenLoc.x = x + (scenario_rand() & 0xFF);
|
||||
} while (vehicle_update_bumper_car_collision(vehicle, chosenLoc.x, chosenLoc.y, NULL));
|
||||
} while (vehicle_update_dodgems_collision(vehicle, chosenLoc.x, chosenLoc.y, NULL));
|
||||
|
||||
sprite_move(chosenLoc.x, chosenLoc.y, z, (rct_sprite*)vehicle);
|
||||
} else {
|
||||
|
|
@ -8065,9 +8065,9 @@ bool shop_item_is_food_or_drink(sint32 shopItem)
|
|||
switch (shopItem) {
|
||||
case SHOP_ITEM_DRINK:
|
||||
case SHOP_ITEM_BURGER:
|
||||
case SHOP_ITEM_FRIES:
|
||||
case SHOP_ITEM_CHIPS:
|
||||
case SHOP_ITEM_ICE_CREAM:
|
||||
case SHOP_ITEM_COTTON_CANDY:
|
||||
case SHOP_ITEM_CANDYFLOSS:
|
||||
case SHOP_ITEM_PIZZA:
|
||||
case SHOP_ITEM_POPCORN:
|
||||
case SHOP_ITEM_HOT_DOG:
|
||||
|
|
@ -8101,9 +8101,9 @@ bool shop_item_is_food(sint32 shopItem)
|
|||
{
|
||||
switch (shopItem) {
|
||||
case SHOP_ITEM_BURGER:
|
||||
case SHOP_ITEM_FRIES:
|
||||
case SHOP_ITEM_CHIPS:
|
||||
case SHOP_ITEM_ICE_CREAM:
|
||||
case SHOP_ITEM_COTTON_CANDY:
|
||||
case SHOP_ITEM_CANDYFLOSS:
|
||||
case SHOP_ITEM_PIZZA:
|
||||
case SHOP_ITEM_POPCORN:
|
||||
case SHOP_ITEM_HOT_DOG:
|
||||
|
|
|
|||
|
|
@ -813,9 +813,9 @@ enum {
|
|||
SHOP_ITEM_UMBRELLA,
|
||||
SHOP_ITEM_DRINK,
|
||||
SHOP_ITEM_BURGER,
|
||||
SHOP_ITEM_FRIES,
|
||||
SHOP_ITEM_CHIPS,
|
||||
SHOP_ITEM_ICE_CREAM,
|
||||
SHOP_ITEM_COTTON_CANDY,
|
||||
SHOP_ITEM_CANDYFLOSS,
|
||||
SHOP_ITEM_EMPTY_CAN,
|
||||
SHOP_ITEM_RUBBISH,
|
||||
SHOP_ITEM_EMPTY_BURGER_BOX,
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ const bool hasRunningTrack[0x60] = {
|
|||
true, // 16 Go Karts
|
||||
true, // 17 Log Flume
|
||||
true, // 18 River Rapids
|
||||
false, // 19 Bumper Cars
|
||||
false, // 19 Dodgems
|
||||
false, // 1a Pirate Ship
|
||||
false, // 1b Swinging Inverter Ship
|
||||
false, // 1c Food Stall
|
||||
|
|
@ -158,7 +158,7 @@ const uint8 initialUpkeepCosts[0x60] = {
|
|||
50, // 16 Go Karts
|
||||
80, // 17 Log Flume
|
||||
82, // 18 River Rapids
|
||||
50, // 19 Bumper Cars
|
||||
50, // 19 Dodgems
|
||||
50, // 1a Pirate Ship
|
||||
50, // 1b Swinging Inverter Ship
|
||||
50, // 1c Food Stall
|
||||
|
|
@ -251,7 +251,7 @@ const uint8 costPerTrackPiece[0x60] = {
|
|||
0, // 16 Go Karts
|
||||
0, // 17 Log Flume
|
||||
0, // 18 River Rapids
|
||||
0, // 19 Bumper Cars
|
||||
0, // 19 Dodgems
|
||||
0, // 1a Pirate Ship
|
||||
0, // 1b Swinging Inverter Ship
|
||||
0, // 1c Food Stall
|
||||
|
|
@ -347,7 +347,7 @@ const uint8 rideUnknownData1[0x60] = {
|
|||
8, // 16 Go Karts
|
||||
9, // 17 Log Flume
|
||||
10, // 18 River Rapids
|
||||
5, // 19 Bumper Cars
|
||||
5, // 19 Dodgems
|
||||
0, // 1a Pirate Ship
|
||||
0, // 1b Swinging Inverter Ship
|
||||
0, // 1c Food Stall
|
||||
|
|
@ -444,7 +444,7 @@ const bool rideUnknownData2[0x60] = {
|
|||
false, // 16 Go Karts
|
||||
false, // 17 Log Flume
|
||||
false, // 18 River Rapids
|
||||
false, // 19 Bumper Cars
|
||||
false, // 19 Dodgems
|
||||
false, // 1a Pirate Ship
|
||||
false, // 1b Swinging Inverter Ship
|
||||
false, // 1c Food Stall
|
||||
|
|
@ -538,7 +538,7 @@ const uint8 rideUnknownData3[0x60] = {
|
|||
0, // 16 Go Karts
|
||||
10, // 17 Log Flume
|
||||
10, // 18 River Rapids
|
||||
0, // 19 Bumper Cars
|
||||
0, // 19 Dodgems
|
||||
0, // 1a Pirate Ship
|
||||
0, // 1b Swinging Inverter Ship
|
||||
0, // 1c Food Stall
|
||||
|
|
@ -632,7 +632,7 @@ const uint8 rideBonusValue[0x60] = {
|
|||
55, // 16 Go Karts
|
||||
65, // 17 Log Flume
|
||||
70, // 18 River Rapids
|
||||
35, // 19 Bumper Cars
|
||||
35, // 19 Dodgems
|
||||
35, // 1a Pirate Ship
|
||||
35, // 1b Swinging Inverter Ship
|
||||
15, // 1c Food Stall
|
||||
|
|
@ -742,7 +742,7 @@ const rct_ride_name_convention RideNameConvention[96] = {
|
|||
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 16 Go Karts
|
||||
{ RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 17 Log Flume
|
||||
{ RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 18 River Rapids
|
||||
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }, // 19 Bumper Cars
|
||||
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }, // 19 Dodgems
|
||||
{ RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }, // 1a Pirate Ship
|
||||
{ RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }, // 1b Swinging Inverter Ship
|
||||
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }, // 1c Food Stall
|
||||
|
|
@ -934,7 +934,7 @@ const uint8 RideAvailableModes[] = {
|
|||
RIDE_MODE_RACE, RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 16 Go Karts
|
||||
RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 17 Log Flume
|
||||
RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 18 River Rapids
|
||||
RIDE_MODE_BUMPERCAR, 0xFF, // 19 Bumper Cars
|
||||
RIDE_MODE_BUMPERCAR, 0xFF, // 19 Dodgems
|
||||
RIDE_MODE_SWING, 0xFF, // 1A Pirate Ship
|
||||
RIDE_MODE_SWING, 0xFF, // 1B Swinging Inverter Ship
|
||||
RIDE_MODE_SHOP_STALL, 0xFF, // 1C Food Stall
|
||||
|
|
@ -1032,7 +1032,7 @@ const uint8 RideAvailableBreakdowns[] = {
|
|||
(1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 16 Go Karts
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), // 17 Log Flume
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), // 18 River Rapids
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT), // 19 Bumper Cars
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT), // 19 Dodgems
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT), // 1A Pirate Ship
|
||||
(1 << BREAKDOWN_SAFETY_CUT_OUT), // 1B Swinging Inverter Ship
|
||||
0, // 1C Food Stall
|
||||
|
|
@ -1412,9 +1412,9 @@ const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT] = {
|
|||
MONEY(2,50), // SHOP_ITEM_UMBRELLA
|
||||
MONEY(1,20), // SHOP_ITEM_DRINK
|
||||
MONEY(1,50), // SHOP_ITEM_BURGER
|
||||
MONEY(1,50), // SHOP_ITEM_FRIES
|
||||
MONEY(1,50), // SHOP_ITEM_CHIPS
|
||||
MONEY(0,90), // SHOP_ITEM_ICE_CREAM
|
||||
MONEY(0,80), // SHOP_ITEM_COTTON_CANDY
|
||||
MONEY(0,80), // SHOP_ITEM_CANDYFLOSS
|
||||
MONEY(0,00), // SHOP_ITEM_EMPTY_CAN
|
||||
MONEY(0,00), // SHOP_ITEM_RUBBISH
|
||||
MONEY(0,00), // SHOP_ITEM_EMPTY_BURGER_BOX
|
||||
|
|
@ -1528,9 +1528,9 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = {
|
|||
SPR_SHOP_ITEM_UMBRELLA,
|
||||
SPR_SHOP_ITEM_DRINK,
|
||||
SPR_SHOP_ITEM_BURGER,
|
||||
SPR_SHOP_ITEM_FRIES,
|
||||
SPR_SHOP_ITEM_CHIPS,
|
||||
SPR_SHOP_ITEM_ICE_CREAM,
|
||||
SPR_SHOP_ITEM_COTTON_CANDY,
|
||||
SPR_SHOP_ITEM_CANDYFLOSS,
|
||||
SPR_SHOP_ITEM_EMPTY_CAN,
|
||||
SPR_SHOP_ITEM_RUBBISH,
|
||||
SPR_SHOP_ITEM_EMPTY_BURGER_BOX,
|
||||
|
|
@ -1663,7 +1663,7 @@ const rct_ride_lift_data RideLiftData[] = {
|
|||
{ 255, 5, 5 }, // Go Karts
|
||||
{ 255, 5, 5 }, // Log Flume
|
||||
{ 255, 5, 5 }, // River Rapids
|
||||
{ 255, 5, 5 }, // Bumper Cars
|
||||
{ 255, 5, 5 }, // Dodgems
|
||||
{ 255, 5, 5 }, // Pirate Ship
|
||||
{ 255, 5, 5 }, // Swinging Inverter Ship
|
||||
{ 255, 5, 5 }, // Food Stall
|
||||
|
|
@ -2435,9 +2435,9 @@ const rct_shop_item_stats ShopItemStats[SHOP_ITEM_COUNT] = {
|
|||
{ 20, 35, 25, 50 }, // SHOP_ITEM_UMBRELLA
|
||||
{ 3, 12, 20, 10 }, // SHOP_ITEM_DRINK
|
||||
{ 5, 19, 19, 22 }, // SHOP_ITEM_BURGER
|
||||
{ 4, 16, 16, 18 }, // SHOP_ITEM_FRIES
|
||||
{ 4, 16, 16, 18 }, // SHOP_ITEM_CHIPS
|
||||
{ 4, 10, 15, 6 }, // SHOP_ITEM_ICE_CREAM
|
||||
{ 3, 9, 9, 6 }, // SHOP_ITEM_COTTON_CANDY
|
||||
{ 3, 9, 9, 6 }, // SHOP_ITEM_CANDYFLOSS
|
||||
{ 0, 0, 0, 0 }, // SHOP_ITEM_EMPTY_CAN
|
||||
{ 0, 0, 0, 0 }, // SHOP_ITEM_RUBBISH
|
||||
{ 0, 0, 0, 0 }, // SHOP_ITEM_EMPTY_BURGER_BOX
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ static uint16 ride_compute_upkeep(rct_ride *ride)
|
|||
|
||||
// The data originally here was 20's and 0's. The 20's all represented
|
||||
// rides that had tracks. The 0's were fixed rides like crooked house or
|
||||
// bumper cars.
|
||||
// dodgems.
|
||||
// Data source is 0x0097E3AC
|
||||
if (hasRunningTrack[ride->type]) {
|
||||
totalLength *= 20;
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ const rct_trackdefinition TrackDefinitions[256] = {
|
|||
{ TRACK_FLAT, TRACK_SLOPE_NONE, TRACK_SLOPE_DOWN_60, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
{ TRACK_FLAT, TRACK_SLOPE_DOWN_60, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122
|
||||
{ TRACK_LIFT_HILL_CABLE, TRACK_SLOPE_DOWN_60, TRACK_SLOPE_UP_25, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_CABLE_LIFT_HILL
|
||||
{ TRACK_WHOA_BELLY, TRACK_VANGLE_WHOA_BELLY, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
{ TRACK_WHOA_BELLY, TRACK_VANGLE_WHOA_BELLY, TRACK_VANGLE_WHOA_BELLY, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
{ TRACK_REVERSE_FREEFALL, TRACK_VANGLE_REVERSE_FREEFALL, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_REVERSE_FREEFALL_SLOPE
|
||||
{ TRACK_REVERSE_FREEFALL, TRACK_VANGLE_REVERSE_FREEFALL, TRACK_VANGLE_REVERSE_FREEFALL, TRACK_BANK_NONE,TRACK_BANK_NONE, TRACK_NONE }, // ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
{ TRACK_FLAT, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_90, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_90_DEG_UP
|
||||
{ TRACK_FLAT, TRACK_SLOPE_DOWN_90, TRACK_SLOPE_DOWN_90, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_90_DEG_DOWN
|
||||
{ TRACK_FLAT, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_60, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_NONE }, // ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -428,8 +428,8 @@ const rct_trackdefinition FlatRideTrackDefinitions[256] = {
|
|||
{ TRACK_FLAT, TRACK_SLOPE_NONE, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // FLAT_TRACK_ELEM_1_X_1_B
|
||||
{ TRACK_FLAT, TRACK_SLOPE_NONE, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, TRACK_216 }, // FLAT_TRACK_ELEM_1_X_4_C
|
||||
{ TRACK_FLAT, TRACK_SLOPE_NONE, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // FLAT_TRACK_ELEM_3_X_3
|
||||
{ TRACK_WHOA_BELLY, TRACK_SLOPE_UP_90, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 124
|
||||
{ TRACK_WHOA_BELLY, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_90, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 125
|
||||
{ TRACK_REVERSE_FREEFALL, TRACK_SLOPE_UP_90, TRACK_SLOPE_NONE, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 124
|
||||
{ TRACK_REVERSE_FREEFALL, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_90, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 125
|
||||
{ TRACK_FLAT, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_90, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 126
|
||||
{ TRACK_FLAT, TRACK_SLOPE_DOWN_90, TRACK_SLOPE_DOWN_90, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 127
|
||||
{ TRACK_FLAT, TRACK_SLOPE_UP_90, TRACK_SLOPE_UP_60, TRACK_BANK_NONE, TRACK_BANK_NONE, 0 }, // 128
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ enum {
|
|||
TRACK_LOG_FLUME_REVERSER,
|
||||
TRACK_HEARTLINE_ROLL,
|
||||
TRACK_REVERSER,
|
||||
TRACK_WHOA_BELLY,
|
||||
TRACK_REVERSE_FREEFALL,
|
||||
TRACK_SLOPE_TO_FLAT,
|
||||
TRACK_BLOCK_BRAKES,
|
||||
TRACK_SLOPE_ROLL_BANKING,
|
||||
|
|
@ -171,7 +171,7 @@ enum {
|
|||
TRACK_SLOPE_DOWN_90 = 18,
|
||||
|
||||
TRACK_VANGLE_TOWER = 10,
|
||||
TRACK_VANGLE_WHOA_BELLY = 10
|
||||
TRACK_VANGLE_REVERSE_FREEFALL = 10
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
@ -335,8 +335,8 @@ enum {
|
|||
TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE,
|
||||
TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122,
|
||||
TRACK_ELEM_CABLE_LIFT_HILL,
|
||||
TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE,
|
||||
TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL,
|
||||
TRACK_ELEM_REVERSE_FREEFALL_SLOPE,
|
||||
TRACK_ELEM_REVERSE_FREEFALL_VERTICAL,
|
||||
TRACK_ELEM_90_DEG_UP,
|
||||
TRACK_ELEM_90_DEG_DOWN,
|
||||
TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP,
|
||||
|
|
|
|||
|
|
@ -399,8 +399,8 @@ const rct_track_coordinates TrackCoordinates[256] = {
|
|||
{ 0, 0, 88, 0, -96, 0 }, // ELEM_60_DEG_DOWN_TO_FLAT_LONG_BASE
|
||||
{ 0, 0, 88, 0, -96, 0 }, // ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
{ 0, 0, 0, -96, -96, 0 }, // ELEM_CABLE_LIFT_HILL
|
||||
{ 0, 0, 0, 240, -160, 0 }, // ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
{ 0, 0, 0, 80, 32, 0 }, // ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
{ 0, 0, 0, 240, -160, 0 }, // ELEM_REVERSE_FREEFALL_SLOPE
|
||||
{ 0, 0, 0, 80, 32, 0 }, // ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
{ 0, 0, 0, 32, 32, 0 }, // ELEM_90_DEG_UP
|
||||
{ 0, 0, 32, 0, 32, 0 }, // ELEM_90_DEG_DOWN
|
||||
{ 0, 0, 0, 56, 32, 0 }, // ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -1097,7 +1097,7 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = {
|
|||
/* RIDE_TYPE_3D_CINEMA */ 0,
|
||||
/* RIDE_TYPE_TOP_SPIN */ 0,
|
||||
/* RIDE_TYPE_SPACE_RINGS */ 0,
|
||||
/* RIDE_TYPE_REVERSE_FREEFALL_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_WHOA_BELLY),
|
||||
/* RIDE_TYPE_REVERSE_FREEFALL_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_REVERSE_FREEFALL),
|
||||
/* RIDE_TYPE_LIFT */ (1ULL << TRACK_TOWER_BASE),
|
||||
/* RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER */ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_CURVE_VERTICAL),
|
||||
/* RIDE_TYPE_CASH_MACHINE */ 0,
|
||||
|
|
@ -1130,7 +1130,7 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = {
|
|||
/* RIDE_TYPE_MONORAIL_CYCLES */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE),
|
||||
/* RIDE_TYPE_COMPACT_INVERTED_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_TWIST) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_LARGE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BLOCK_BRAKES),
|
||||
/* RIDE_TYPE_WATER_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES),
|
||||
/* RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_WHOA_BELLY) | (1ULL << TRACK_SLOPE_TO_FLAT),
|
||||
/* RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_REVERSE_FREEFALL) | (1ULL << TRACK_SLOPE_TO_FLAT),
|
||||
/* RIDE_TYPE_INVERTED_HAIRPIN_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES),
|
||||
/* RIDE_TYPE_MAGIC_CARPET */ 0,
|
||||
/* RIDE_TYPE_SUBMARINE_RIDE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL),
|
||||
|
|
@ -5591,8 +5591,8 @@ const uint8 TrackPieceLengths[256] = {
|
|||
165, // TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
165, // TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122
|
||||
138, // TRACK_ELEM_CABLE_LIFT_HILL
|
||||
32, // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
32, // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
32, // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
32, // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
32, // TRACK_ELEM_90_DEG_UP
|
||||
32, // TRACK_ELEM_90_DEG_DOWN
|
||||
32, // TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -31250,8 +31250,8 @@ const money32 TrackPricing[] = {
|
|||
376832, // TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
376832, // TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122
|
||||
643072, // TRACK_ELEM_CABLE_LIFT_HILL
|
||||
491520, // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
65536, // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
491520, // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
65536, // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
69632, // TRACK_ELEM_90_DEG_UP
|
||||
69632, // TRACK_ELEM_90_DEG_DOWN
|
||||
114688, // TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -32024,8 +32024,8 @@ const uint8 TrackElementMirrorMap[] = {
|
|||
TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE,
|
||||
TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122,
|
||||
TRACK_ELEM_CABLE_LIFT_HILL,
|
||||
TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE,
|
||||
TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL,
|
||||
TRACK_ELEM_REVERSE_FREEFALL_SLOPE,
|
||||
TRACK_ELEM_REVERSE_FREEFALL_VERTICAL,
|
||||
TRACK_ELEM_90_DEG_UP,
|
||||
TRACK_ELEM_90_DEG_DOWN,
|
||||
TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP,
|
||||
|
|
@ -32284,8 +32284,8 @@ const uint32 TrackHeightMarkerPositions[256] = {
|
|||
(1 << 0) | (1 << 3), // TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
(1 << 0) | (1 << 3), // TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122
|
||||
(1 << 0) | (1 << 3), // TRACK_ELEM_CABLE_LIFT_HILL
|
||||
(1 << 0) | (1 << 5), // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
(1 << 0), // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
(1 << 0) | (1 << 5), // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
(1 << 0), // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
(1 << 0), // TRACK_ELEM_90_DEG_UP
|
||||
(1 << 0), // TRACK_ELEM_90_DEG_DOWN
|
||||
(1 << 0), // TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -32544,8 +32544,8 @@ const uint8 TrackSequenceElementAllowedWallEdges[][16] = {
|
|||
{ 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE
|
||||
{ 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122
|
||||
{ 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_CABLE_LIFT_HILL
|
||||
{ 0b1010, 0b1010, 0b1010, 0b1010, 0b1010, 0b1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
{ 0b1010, 0b1010, 0b1010, 0b1010, 0b1010, 0b1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
{ 0b1111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_90_DEG_UP
|
||||
{ 0b1111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_90_DEG_DOWN
|
||||
{ 0b1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP
|
||||
|
|
@ -33319,8 +33319,8 @@ const uint16 TrackFlags[] = {
|
|||
/* TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE */ TRACK_ELEM_FLAG_DOWN,
|
||||
/* TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122 */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_0100,
|
||||
/* TRACK_ELEM_CABLE_LIFT_HILL */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_0100,
|
||||
/* TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE */ TRACK_ELEM_FLAG_UP,
|
||||
/* TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL */ TRACK_ELEM_FLAG_UP,
|
||||
/* TRACK_ELEM_REVERSE_FREEFALL_SLOPE */ TRACK_ELEM_FLAG_UP,
|
||||
/* TRACK_ELEM_REVERSE_FREEFALL_VERTICAL */ TRACK_ELEM_FLAG_UP,
|
||||
/* TRACK_ELEM_90_DEG_UP */ TRACK_ELEM_FLAG_UP,
|
||||
/* TRACK_ELEM_90_DEG_DOWN */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_1000,
|
||||
/* TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP */ TRACK_ELEM_FLAG_UP | TRACK_ELEM_FLAG_0100,
|
||||
|
|
|
|||
|
|
@ -9510,8 +9510,8 @@ static const uint32 _OldReverseFreefallCoasterTrackPaintFunctions[256] = {
|
|||
0,
|
||||
0,
|
||||
0,
|
||||
0x00768DF4, // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
0x00768E04, // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
0x00768DF4, // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
0x00768E04, // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
|
|
@ -16790,8 +16790,8 @@ static const uint32 _OldAirPoweredVerticalCoasterTrackPaintFunctions[256] = {
|
|||
0,
|
||||
0,
|
||||
0,
|
||||
0x008AFB14, // TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE
|
||||
0x008AFB34, // TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL
|
||||
0x008AFB14, // TRACK_ELEM_REVERSE_FREEFALL_SLOPE
|
||||
0x008AFB34, // TRACK_ELEM_REVERSE_FREEFALL_VERTICAL
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
|
|
|
|||
|
|
@ -1833,7 +1833,7 @@ static void track_design_preview_clear_map()
|
|||
map_element->clearance_height = 0;
|
||||
map_element->properties.surface.slope = 0;
|
||||
map_element->properties.surface.terrain = 0;
|
||||
map_element->properties.surface.grass_length = 1;
|
||||
map_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0;
|
||||
map_element->properties.surface.ownership = OWNERSHIP_OWNED;
|
||||
}
|
||||
map_update_tile_pointers();
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ static void vehicle_update_rotating(rct_vehicle* vehicle);
|
|||
static void vehicle_update_space_rings_operating(rct_vehicle* vehicle);
|
||||
static void vehicle_update_haunted_house_operating(rct_vehicle* vehicle);
|
||||
static void vehicle_update_crooked_house_operating(rct_vehicle* vehicle);
|
||||
static void vehicle_update_bumpcar_mode(rct_vehicle* vehicle);
|
||||
static void vehicle_update_dodgems_mode(rct_vehicle* vehicle);
|
||||
static void vehicle_update_swinging(rct_vehicle* vehicle);
|
||||
static void vehicle_update_simulator_operating(rct_vehicle* vehicle);
|
||||
static void vehicle_update_top_spin_operating(rct_vehicle* vehicle);
|
||||
|
|
@ -68,7 +68,7 @@ static void vehicle_update_waiting_for_cable_lift(rct_vehicle *vehicle);
|
|||
static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle);
|
||||
static void vehicle_update_crash_setup(rct_vehicle* vehicle);
|
||||
static void vehicle_update_collision_setup(rct_vehicle* vehicle);
|
||||
static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle);
|
||||
static sint32 vehicle_update_motion_dodgems(rct_vehicle* vehicle);
|
||||
static void sub_6D63D4(rct_vehicle *vehicle);
|
||||
static bool vehicle_update_motion_collision_detection(rct_vehicle *vehicle, sint16 x, sint16 y, sint16 z, uint16 *otherVehicleIndex);
|
||||
static void vehicle_update_sound(rct_vehicle *vehicle);
|
||||
|
|
@ -1620,8 +1620,8 @@ static void vehicle_update(rct_vehicle *vehicle)
|
|||
case VEHICLE_STATUS_CRASHED:
|
||||
vehicle_update_crash(vehicle);
|
||||
break;
|
||||
case VEHICLE_STATUS_TRAVELLING_BUMPER_CARS:
|
||||
vehicle_update_bumpcar_mode(vehicle);
|
||||
case VEHICLE_STATUS_TRAVELLING_DODGEMS:
|
||||
vehicle_update_dodgems_mode(vehicle);
|
||||
break;
|
||||
case VEHICLE_STATUS_SWINGING:
|
||||
vehicle_update_swinging(vehicle);
|
||||
|
|
@ -2036,7 +2036,7 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle){
|
|||
*
|
||||
* rct2: 0x006D91BF
|
||||
*/
|
||||
static void vehicle_update_bumpcar_mode(rct_vehicle* vehicle) {
|
||||
static void vehicle_update_dodgems_mode(rct_vehicle *vehicle) {
|
||||
rct_ride* ride = get_ride(vehicle->ride);
|
||||
rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype);
|
||||
rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type];
|
||||
|
|
@ -2046,7 +2046,7 @@ static void vehicle_update_bumpcar_mode(rct_vehicle* vehicle) {
|
|||
vehicle_invalidate(vehicle);
|
||||
}
|
||||
|
||||
vehicle_update_motion_bumper_car(vehicle);
|
||||
vehicle_update_motion_dodgems(vehicle);
|
||||
|
||||
// Update the length of time vehicle has been in bumper mode
|
||||
if (vehicle->sub_state++ == 0xFF) {
|
||||
|
|
@ -2163,13 +2163,13 @@ static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle) {
|
|||
|
||||
switch (ride->mode) {
|
||||
case RIDE_MODE_BUMPERCAR:
|
||||
vehicle->status = VEHICLE_STATUS_TRAVELLING_BUMPER_CARS;
|
||||
vehicle->status = VEHICLE_STATUS_TRAVELLING_DODGEMS;
|
||||
vehicle_invalidate_window(vehicle);
|
||||
// Bumper mode uses sub_state / var_CE to tell how long
|
||||
// the vehicle has been ridden.
|
||||
vehicle->sub_state = 0;
|
||||
vehicle->var_CE = 0;
|
||||
vehicle_update_bumpcar_mode(vehicle);
|
||||
vehicle_update_dodgems_mode(vehicle);
|
||||
break;
|
||||
case RIDE_MODE_SWING:
|
||||
vehicle->status = VEHICLE_STATUS_SWINGING;
|
||||
|
|
@ -5034,7 +5034,7 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, sint32 *verticalG, sint32 *later
|
|||
case TRACK_ELEM_25_DEG_DOWN_LEFT_BANKED:
|
||||
case TRACK_ELEM_25_DEG_DOWN_RIGHT_BANKED:
|
||||
case TRACK_ELEM_WHIRLPOOL:
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_VERTICAL:
|
||||
case TRACK_ELEM_90_DEG_UP:
|
||||
case TRACK_ELEM_90_DEG_DOWN:
|
||||
case TRACK_ELEM_DIAG_FLAT:
|
||||
|
|
@ -5300,7 +5300,7 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, sint32 *verticalG, sint32 *later
|
|||
vertFactor = -160;
|
||||
//6d74FD
|
||||
break;
|
||||
case TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE:
|
||||
case TRACK_ELEM_REVERSE_FREEFALL_SLOPE:
|
||||
case TRACK_ELEM_AIR_THRUST_VERTICAL_DOWN_TO_LEVEL:
|
||||
vertFactor = 120;
|
||||
//6d7458
|
||||
|
|
@ -5574,7 +5574,7 @@ sint32 vehicle_is_used_in_pairs(rct_vehicle *vehicle)
|
|||
*
|
||||
* rct2: 0x006DA44E
|
||||
*/
|
||||
static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle) {
|
||||
static sint32 vehicle_update_motion_dodgems(rct_vehicle* vehicle) {
|
||||
_vehicleMotionTrackFlags = 0;
|
||||
rct_ride* ride = get_ride(vehicle->ride);
|
||||
|
||||
|
|
@ -5633,7 +5633,7 @@ static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle) {
|
|||
location.x += Unk9A36C4[oldC4 + 1].x;
|
||||
location.y += Unk9A36C4[oldC4 + 1].y;
|
||||
|
||||
if (!vehicle_update_bumper_car_collision(vehicle, location.x, location.y, &collideSprite)) {
|
||||
if (!vehicle_update_dodgems_collision(vehicle, location.x, location.y, &collideSprite)) {
|
||||
vehicle_invalidate(vehicle);
|
||||
sprite_move(
|
||||
location.x,
|
||||
|
|
@ -5664,7 +5664,7 @@ static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle) {
|
|||
location.x += Unk9A36C4[direction].x;
|
||||
location.y += Unk9A36C4[direction].y;
|
||||
|
||||
if (vehicle_update_bumper_car_collision(vehicle, location.x, location.y, &collideSprite))
|
||||
if (vehicle_update_dodgems_collision(vehicle, location.x, location.y, &collideSprite))
|
||||
break;
|
||||
|
||||
vehicle->remaining_distance -= Unk9A36C4[direction].distance;
|
||||
|
|
@ -5744,7 +5744,7 @@ static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle) {
|
|||
*
|
||||
* rct2: 0x006DD365
|
||||
*/
|
||||
bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 y, uint16 *spriteId)
|
||||
bool vehicle_update_dodgems_collision(rct_vehicle *vehicle, sint16 x, sint16 y, uint16 *spriteId)
|
||||
{
|
||||
uint16 bp = (vehicle->var_44 * 30) >> 9;
|
||||
uint32 trackType = vehicle->track_type >> 2;
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ enum {
|
|||
VEHICLE_STATUS_TRAVELLING_BOAT,
|
||||
VEHICLE_STATUS_CRASHING,
|
||||
VEHICLE_STATUS_CRASHED,
|
||||
VEHICLE_STATUS_TRAVELLING_BUMPER_CARS,
|
||||
VEHICLE_STATUS_TRAVELLING_DODGEMS,
|
||||
VEHICLE_STATUS_SWINGING,
|
||||
VEHICLE_STATUS_ROTATING,
|
||||
VEHICLE_STATUS_FERRIS_WHEEL_ROTATING,
|
||||
|
|
@ -383,7 +383,7 @@ rct_vehicle *vehicle_get_head(rct_vehicle *vehicle);
|
|||
rct_vehicle *vehicle_get_tail(rct_vehicle *vehicle);
|
||||
const rct_vehicle_info *vehicle_get_move_info(sint32 cd, sint32 typeAndDirection, sint32 offset);
|
||||
uint16 vehicle_get_move_info_size(sint32 cd, sint32 typeAndDirection);
|
||||
bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 y, uint16 *spriteId);
|
||||
bool vehicle_update_dodgems_collision(rct_vehicle *vehicle, sint16 x, sint16 y, uint16 *spriteId);
|
||||
|
||||
extern rct_vehicle *gCurrentVehicle;
|
||||
extern uint8 _vehicleStationIndex;
|
||||
|
|
|
|||
|
|
@ -28,9 +28,18 @@ enum {
|
|||
SPR_EDGE_WOOD_BLACK_BASE = 1663,
|
||||
SPR_EDGE_ICE_BASE = 1831,
|
||||
|
||||
SPR_TERRAIN_SELECTION_SQUARE_SIMPLE = 2624, // Used for showing peep spawn
|
||||
SPR_TERRAIN_SELECTION_SQUARE = 2625, // Used to show land owned by park
|
||||
SPR_TERRAIN_SELECTION_DOTTED = 2644, // Used to show construction rights owned by park
|
||||
|
||||
SPR_PALETTE_1_START = 3100,
|
||||
SPR_PALETTE_1_END = 3110,
|
||||
|
||||
PEEP_SPAWN_ARROW_0 = 3111,
|
||||
PEEP_SPAWN_ARROW_1 = 3112,
|
||||
PEEP_SPAWN_ARROW_2 = 3113,
|
||||
PEEP_SPAWN_ARROW_3 = 3114,
|
||||
|
||||
// This is the start of every character there are
|
||||
// 224 characters per font (first 32 are control codes hence why it doesn't go to 255)
|
||||
// 4 fonts
|
||||
|
|
@ -52,9 +61,9 @@ enum {
|
|||
SPR_SHOP_ITEM_UMBRELLA = 5065,
|
||||
SPR_SHOP_ITEM_DRINK = 5066,
|
||||
SPR_SHOP_ITEM_BURGER = 5067,
|
||||
SPR_SHOP_ITEM_FRIES = 5068,
|
||||
SPR_SHOP_ITEM_CHIPS = 5068,
|
||||
SPR_SHOP_ITEM_ICE_CREAM = 5069,
|
||||
SPR_SHOP_ITEM_COTTON_CANDY = 5070,
|
||||
SPR_SHOP_ITEM_CANDYFLOSS = 5070,
|
||||
SPR_SHOP_ITEM_EMPTY_CAN = 5071,
|
||||
SPR_SHOP_ITEM_RUBBISH = 5072,
|
||||
SPR_SHOP_ITEM_EMPTY_BURGER_BOX = 5073,
|
||||
|
|
@ -659,6 +668,9 @@ enum {
|
|||
SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS = 21992,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAZE_WOODEN_FENCES = 21993,
|
||||
|
||||
SPR_LAND_OWNERSHIP_AVAILABLE = 22955,
|
||||
SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE = 22956,
|
||||
|
||||
SPR_DUCK = 23133,
|
||||
|
||||
SPR_NEXT_WEATHER = 23189,
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ static rct_object_entry DefaultSelectedObjects[] = {
|
|||
{ 0x00000080, { "FAID1 " }, 0 }, // Ride: First Aid Room
|
||||
{ 0x00000080, { "INFOK " }, 0 }, // Ride: Information Kiosk
|
||||
{ 0x00000080, { "DRNKS " }, 0 }, // Ride: Drinks Stall
|
||||
{ 0x00000080, { "CNDYF " }, 0 }, // Ride: Cotton Candy Stall
|
||||
{ 0x00000080, { "CNDYF " }, 0 }, // Ride: Candyfloss Stall
|
||||
{ 0x00000080, { "BURGB " }, 0 }, // Ride: Burger Bar
|
||||
{ 0x00000080, { "BALLN " }, 0 }, // Ride: Balloon Stall
|
||||
{ 0x00000080, { "ARRT1 " }, 0 }, // Ride: Corkscrew Roller Coaster
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ static const rct_string_id VehicleStatusNames[] = {
|
|||
STR_TRAVELLING_AT_1, // VEHICLE_STATUS_TRAVELLING_BOAT
|
||||
STR_CRASHING, // VEHICLE_STATUS_CRASHING
|
||||
STR_CRASHED_0, // VEHICLE_STATUS_CRASHED
|
||||
STR_TRAVELLING_AT_2, // VEHICLE_STATUS_TRAVELLING_BUMPER_CARS
|
||||
STR_TRAVELLING_AT_2, // VEHICLE_STATUS_TRAVELLING_DODGEMS
|
||||
STR_SWINGING, // VEHICLE_STATUS_SWINGING
|
||||
STR_ROTATING_0, // VEHICLE_STATUS_ROTATING
|
||||
STR_ROTATING_1, // VEHICLE_STATUS_FERRIS_WHEEL_ROTATING
|
||||
|
|
@ -1101,7 +1101,7 @@ static const rct_string_id RideModeNames[] = {
|
|||
STR_RIDE_MODE_UNLIMITED_RIDES_PER_ADMISSION,
|
||||
STR_RIDE_MODE_MAZE,
|
||||
STR_RIDE_MODE_RACE,
|
||||
STR_RIDE_MODE_BUMPER_CAR,
|
||||
STR_RIDE_MODE_DODGEMS,
|
||||
STR_RIDE_MODE_SWING,
|
||||
STR_RIDE_MODE_SHOP_STALL,
|
||||
STR_RIDE_MODE_ROTATION,
|
||||
|
|
|
|||
|
|
@ -1455,7 +1455,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
|
|||
}
|
||||
if (ride->type == RIDE_TYPE_REVERSE_FREEFALL_COASTER || ride->type == RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER) {
|
||||
if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_FRONT && _currentTrackCurve == TRACK_CURVE_NONE) {
|
||||
_currentTrackCurve = TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE | 0x100;
|
||||
_currentTrackCurve = TRACK_ELEM_REVERSE_FREEFALL_SLOPE | 0x100;
|
||||
sub_6C84CE();
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ void map_init(sint32 size)
|
|||
map_element->base_height = 14;
|
||||
map_element->clearance_height = 14;
|
||||
map_element->properties.surface.slope = 0;
|
||||
map_element->properties.surface.grass_length = 1;
|
||||
map_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0;
|
||||
map_element->properties.surface.ownership = 0;
|
||||
map_element->properties.surface.terrain = 0;
|
||||
|
||||
|
|
@ -3927,7 +3927,7 @@ static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr)
|
|||
element->clearance_height = 2;
|
||||
element->properties.surface.slope = 0;
|
||||
element->properties.surface.terrain = 0;
|
||||
element->properties.surface.grass_length = 1;
|
||||
element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0;
|
||||
element->properties.surface.ownership = 0;
|
||||
// Because this element is not completely removed, the pointer must be updated manually
|
||||
// The rest of the elements are removed from the array, so the pointer doesn't need to be updated.
|
||||
|
|
|
|||
|
|
@ -754,8 +754,8 @@ const utf8string TrackElemNames[] = {
|
|||
"TRACK_ELEM_FLAT_TO_60_DEG_DOWN_LONG_BASE",
|
||||
"TRACK_ELEM_60_DEG_UP_TO_FLAT_LONG_BASE_122",
|
||||
"TRACK_ELEM_CABLE_LIFT_HILL",
|
||||
"TRACK_ELEM_REVERSE_WHOA_BELLY_SLOPE",
|
||||
"TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL",
|
||||
"TRACK_ELEM_REVERSE_FREEFALL_SLOPE",
|
||||
"TRACK_ELEM_REVERSE_FREEFALL_VERTICAL",
|
||||
"TRACK_ELEM_90_DEG_UP",
|
||||
"TRACK_ELEM_90_DEG_DOWN",
|
||||
"TRACK_ELEM_60_DEG_UP_TO_90_DEG_UP",
|
||||
|
|
@ -1107,8 +1107,8 @@ const utf8string TrackCodeNames[256] = {
|
|||
"flat_to_60_deg_down_long_base",
|
||||
"60_deg_up_to_flat_long_base122",
|
||||
"cable_lift_hill",
|
||||
"reverse_whoa_belly_slope",
|
||||
"reverse_whoa_belly_vertical",
|
||||
"reverse_freefall_slope",
|
||||
"reverse_freefall_vertical",
|
||||
"90_deg_up",
|
||||
"90_deg_down",
|
||||
"60_deg_up_to_90_deg_up",
|
||||
|
|
|
|||
Loading…
Reference in New Issue