mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #4187 from marijnvdwerf/clean/sprite-ids-1
Clean up raw sprite ID usage
This commit is contained in:
Ted John
GitHub
commit
dbb4404a1d
|
|
@ -28,6 +28,7 @@
|
|||
#include "ride.h"
|
||||
#include "ride_data.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../sprites.h"
|
||||
|
||||
const bool hasRunningTrack[0x60] = {
|
||||
true, // 0 Spiral Roller coaster
|
||||
|
|
@ -1424,60 +1425,60 @@ const rct_shop_item_string_types ShopItemStringIds[SHOP_ITEM_COUNT] = {
|
|||
};
|
||||
|
||||
const uint32 ShopItemImage[SHOP_ITEM_COUNT] = {
|
||||
5061, // SHOP_ITEM_BALLOON
|
||||
5062, // SHOP_ITEM_TOY
|
||||
5063, // SHOP_ITEM_MAP
|
||||
5064, // SHOP_ITEM_PHOTO
|
||||
5065, // SHOP_ITEM_UMBRELLA
|
||||
5066, // SHOP_ITEM_DRINK
|
||||
5067, // SHOP_ITEM_BURGER
|
||||
5068, // SHOP_ITEM_FRIES
|
||||
5069, // SHOP_ITEM_ICE_CREAM
|
||||
5070, // SHOP_ITEM_COTTON_CANDY
|
||||
5071, // SHOP_ITEM_EMPTY_CAN
|
||||
5072, // SHOP_ITEM_RUBBISH
|
||||
5073, // SHOP_ITEM_EMPTY_BURGER_BOX
|
||||
5074, // SHOP_ITEM_PIZZA
|
||||
5075, // SHOP_ITEM_VOUCHER
|
||||
5076, // SHOP_ITEM_POPCORN
|
||||
5077, // SHOP_ITEM_HOT_DOG
|
||||
5078, // SHOP_ITEM_TENTACLE
|
||||
5079, // SHOP_ITEM_HAT
|
||||
5080, // SHOP_ITEM_CANDY_APPLE
|
||||
5081, // SHOP_ITEM_TSHIRT
|
||||
5082, // SHOP_ITEM_DONUT
|
||||
5083, // SHOP_ITEM_COFFEE
|
||||
5084, // SHOP_ITEM_EMPTY_CUP
|
||||
5085, // SHOP_ITEM_CHICKEN
|
||||
5086, // SHOP_ITEM_LEMONADE
|
||||
5087, // SHOP_ITEM_EMPTY_BOX
|
||||
5088, // SHOP_ITEM_EMPTY_BOTTLE
|
||||
SPR_SHOP_ITEM_BALLOON,
|
||||
SPR_SHOP_ITEM_TOY,
|
||||
SPR_SHOP_ITEM_MAP,
|
||||
SPR_SHOP_ITEM_PHOTO,
|
||||
SPR_SHOP_ITEM_UMBRELLA,
|
||||
SPR_SHOP_ITEM_DRINK,
|
||||
SPR_SHOP_ITEM_BURGER,
|
||||
SPR_SHOP_ITEM_FRIES,
|
||||
SPR_SHOP_ITEM_ICE_CREAM,
|
||||
SPR_SHOP_ITEM_COTTON_CANDY,
|
||||
SPR_SHOP_ITEM_EMPTY_CAN,
|
||||
SPR_SHOP_ITEM_RUBBISH,
|
||||
SPR_SHOP_ITEM_EMPTY_BURGER_BOX,
|
||||
SPR_SHOP_ITEM_PIZZA,
|
||||
SPR_SHOP_ITEM_VOUCHER,
|
||||
SPR_SHOP_ITEM_POPCORN,
|
||||
SPR_SHOP_ITEM_HOT_DOG,
|
||||
SPR_SHOP_ITEM_TENTACLE,
|
||||
SPR_SHOP_ITEM_HAT,
|
||||
SPR_SHOP_ITEM_CANDY_APPLE,
|
||||
SPR_SHOP_ITEM_TSHIRT,
|
||||
SPR_SHOP_ITEM_DONUT,
|
||||
SPR_SHOP_ITEM_COFFEE,
|
||||
SPR_SHOP_ITEM_EMPTY_CUP,
|
||||
SPR_SHOP_ITEM_CHICKEN,
|
||||
SPR_SHOP_ITEM_LEMONADE,
|
||||
SPR_SHOP_ITEM_EMPTY_BOX,
|
||||
SPR_SHOP_ITEM_EMPTY_BOTTLE,
|
||||
0, // 28
|
||||
0, // 29
|
||||
0, // 30
|
||||
0, // 31
|
||||
5089, // SHOP_ITEM_PHOTO2
|
||||
5090, // SHOP_ITEM_PHOTO3
|
||||
5091, // SHOP_ITEM_PHOTO4
|
||||
5092, // SHOP_ITEM_PRETZEL
|
||||
5093, // SHOP_ITEM_CHOCOLATE
|
||||
5094, // SHOP_ITEM_ICED_TEA
|
||||
5095, // SHOP_ITEM_FUNNEL_CAKE
|
||||
5096, // SHOP_ITEM_SUNGLASSES
|
||||
5097, // SHOP_ITEM_BEEF_NOODLES
|
||||
5098, // SHOP_ITEM_FRIED_RICE_NOODLES
|
||||
5099, // SHOP_ITEM_WONTON_SOUP
|
||||
5100, // SHOP_ITEM_MEATBALL_SOUP
|
||||
5101, // SHOP_ITEM_FRUIT_JUICE
|
||||
5102, // SHOP_ITEM_SOYBEAN_MILK
|
||||
5103, // SHOP_ITEM_SU_JONGKWA
|
||||
5104, // SHOP_ITEM_SUB_SANDWICH
|
||||
5105, // SHOP_ITEM_COOKIE
|
||||
5106, // SHOP_ITEM_EMPTY_BOWL_RED
|
||||
5107, // SHOP_ITEM_EMPTY_DRINK_CARTON
|
||||
5108, // SHOP_ITEM_EMPTY_JUICE_CUP
|
||||
5109, // SHOP_ITEM_ROAST_SAUSAGE
|
||||
5110, // SHOP_ITEM_EMPTY_BOWL_BLUE
|
||||
SPR_SHOP_ITEM_PHOTO2,
|
||||
SPR_SHOP_ITEM_PHOTO3,
|
||||
SPR_SHOP_ITEM_PHOTO4,
|
||||
SPR_SHOP_ITEM_PRETZEL,
|
||||
SPR_SHOP_ITEM_CHOCOLATE,
|
||||
SPR_SHOP_ITEM_ICED_TEA,
|
||||
SPR_SHOP_ITEM_FUNNEL_CAKE,
|
||||
SPR_SHOP_ITEM_SUNGLASSES,
|
||||
SPR_SHOP_ITEM_BEEF_NOODLES,
|
||||
SPR_SHOP_ITEM_FRIED_RICE_NOODLES,
|
||||
SPR_SHOP_ITEM_WONTON_SOUP,
|
||||
SPR_SHOP_ITEM_MEATBALL_SOUP,
|
||||
SPR_SHOP_ITEM_FRUIT_JUICE,
|
||||
SPR_SHOP_ITEM_SOYBEAN_MILK,
|
||||
SPR_SHOP_ITEM_SU_JONGKWA,
|
||||
SPR_SHOP_ITEM_SUB_SANDWICH,
|
||||
SPR_SHOP_ITEM_COOKIE,
|
||||
SPR_SHOP_ITEM_EMPTY_BOWL_RED,
|
||||
SPR_SHOP_ITEM_EMPTY_DRINK_CARTON,
|
||||
SPR_SHOP_ITEM_EMPTY_JUICE_CUP,
|
||||
SPR_SHOP_ITEM_ROAST_SAUSAGE,
|
||||
SPR_SHOP_ITEM_EMPTY_BOWL_BLUE,
|
||||
};
|
||||
|
||||
const rct_ride_entry_vehicle CableLiftVehicle = {
|
||||
|
|
|
|||
201
src/sprites.h
201
src/sprites.h
|
|
@ -37,6 +37,74 @@ enum {
|
|||
SPR_RESIZE = 5058,
|
||||
SPR_PALETTE_BTN = 5059,
|
||||
SPR_PALETTE_BTN_PRESSED = 5060,
|
||||
SPR_SHOP_ITEM_BALLOON = 5061,
|
||||
SPR_SHOP_ITEM_TOY = 5062,
|
||||
SPR_SHOP_ITEM_MAP = 5063,
|
||||
SPR_SHOP_ITEM_PHOTO = 5064,
|
||||
SPR_SHOP_ITEM_UMBRELLA = 5065,
|
||||
SPR_SHOP_ITEM_DRINK = 5066,
|
||||
SPR_SHOP_ITEM_BURGER = 5067,
|
||||
SPR_SHOP_ITEM_FRIES = 5068,
|
||||
SPR_SHOP_ITEM_ICE_CREAM = 5069,
|
||||
SPR_SHOP_ITEM_COTTON_CANDY = 5070,
|
||||
SPR_SHOP_ITEM_EMPTY_CAN = 5071,
|
||||
SPR_SHOP_ITEM_RUBBISH = 5072,
|
||||
SPR_SHOP_ITEM_EMPTY_BURGER_BOX = 5073,
|
||||
SPR_SHOP_ITEM_PIZZA = 5074,
|
||||
SPR_SHOP_ITEM_VOUCHER = 5075,
|
||||
SPR_SHOP_ITEM_POPCORN = 5076,
|
||||
SPR_SHOP_ITEM_HOT_DOG = 5077,
|
||||
SPR_SHOP_ITEM_TENTACLE = 5078,
|
||||
SPR_SHOP_ITEM_HAT = 5079,
|
||||
SPR_SHOP_ITEM_CANDY_APPLE = 5080,
|
||||
SPR_SHOP_ITEM_TSHIRT = 5081,
|
||||
SPR_SHOP_ITEM_DONUT = 5082,
|
||||
SPR_SHOP_ITEM_COFFEE = 5083,
|
||||
SPR_SHOP_ITEM_EMPTY_CUP = 5084,
|
||||
SPR_SHOP_ITEM_CHICKEN = 5085,
|
||||
SPR_SHOP_ITEM_LEMONADE = 5086,
|
||||
SPR_SHOP_ITEM_EMPTY_BOX = 5087,
|
||||
SPR_SHOP_ITEM_EMPTY_BOTTLE = 5088,
|
||||
SPR_SHOP_ITEM_PHOTO2 = 5089,
|
||||
SPR_SHOP_ITEM_PHOTO3 = 5090,
|
||||
SPR_SHOP_ITEM_PHOTO4 = 5091,
|
||||
SPR_SHOP_ITEM_PRETZEL = 5092,
|
||||
SPR_SHOP_ITEM_CHOCOLATE = 5093,
|
||||
SPR_SHOP_ITEM_ICED_TEA = 5094,
|
||||
SPR_SHOP_ITEM_FUNNEL_CAKE = 5095,
|
||||
SPR_SHOP_ITEM_SUNGLASSES = 5096,
|
||||
SPR_SHOP_ITEM_BEEF_NOODLES = 5097,
|
||||
SPR_SHOP_ITEM_FRIED_RICE_NOODLES = 5098,
|
||||
SPR_SHOP_ITEM_WONTON_SOUP = 5099,
|
||||
SPR_SHOP_ITEM_MEATBALL_SOUP = 5100,
|
||||
SPR_SHOP_ITEM_FRUIT_JUICE = 5101,
|
||||
SPR_SHOP_ITEM_SOYBEAN_MILK = 5102,
|
||||
SPR_SHOP_ITEM_SU_JONGKWA = 5103,
|
||||
SPR_SHOP_ITEM_SUB_SANDWICH = 5104,
|
||||
SPR_SHOP_ITEM_COOKIE = 5105,
|
||||
SPR_SHOP_ITEM_EMPTY_BOWL_RED = 5106,
|
||||
SPR_SHOP_ITEM_EMPTY_DRINK_CARTON = 5107,
|
||||
SPR_SHOP_ITEM_EMPTY_JUICE_CUP = 5108,
|
||||
SPR_SHOP_ITEM_ROAST_SAUSAGE = 5109,
|
||||
SPR_SHOP_ITEM_EMPTY_BOWL_BLUE = 5110,
|
||||
SPR_STAFF_ORDERS_SWEEPING = 5111,
|
||||
SPR_STAFF_ORDERS_WATER_FLOWERS = 5112,
|
||||
SPR_STAFF_ORDERS_EMPTY_BINS = 5113,
|
||||
SPR_STAFF_ORDERS_MOWING = 5114,
|
||||
SPR_STAFF_ORDERS_INSPECT_RIDES = 5115,
|
||||
SPR_STAFF_ORDERS_FIX_RIDES = 5116,
|
||||
SPR_STAFF_PATROL_PATH = 5117,
|
||||
SPR_STAFF_COSTUME_PANDA = 5118,
|
||||
SPR_STAFF_COSTUME_TIGER = 5119,
|
||||
SPR_STAFF_COSTUME_ELEPHANT = 5120,
|
||||
SPR_STAFF_COSTUME_ROMAN = 5121,
|
||||
SPR_STAFF_COSTUME_GORILLA = 5122,
|
||||
SPR_STAFF_COSTUME_SNOWMAN = 5123,
|
||||
SPR_STAFF_COSTUME_KNIGHT = 5124,
|
||||
SPR_STAFF_COSTUME_ASTRONAUT = 5125,
|
||||
SPR_STAFF_COSTUME_BANDIT = 5126,
|
||||
SPR_STAFF_COSTUME_SHERIFF = 5127,
|
||||
SPR_STAFF_COSTUME_PIRATE = 5128,
|
||||
|
||||
SPR_RIDE_CONSTRUCTION_STRAIGHT = 5137,
|
||||
SPR_RIDE_CONSTRUCTION_LEFT_CURVE = 5138,
|
||||
|
|
@ -445,6 +513,139 @@ enum {
|
|||
SPR_CONSTRUCTION_FOOTPATH_LAND = 5639,
|
||||
SPR_CONSTRUCTION_FOOTPATH_BRIDGE = 5640,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK = 14222,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS = 14223,
|
||||
SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK = 14224,
|
||||
SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS = 14225,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK = 14226,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS = 14227,
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_TRACK = 14228,
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_SUPPORTS = 14229,
|
||||
SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_TRACK = 14230,
|
||||
SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_SUPPORTS = 14231,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_TRACK = 14232,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_SUPPORTS = 14233,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MONORAIL_TRACK = 14234,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS = 14235,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK = 14236,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS = 14237,
|
||||
SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK = 14238,
|
||||
SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS = 14239,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK = 14240,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS = 14241,
|
||||
SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK = 14242,
|
||||
SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_SUPPORTS = 14243,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_TRACK = 14244,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_SUPPORTS = 14245,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_TRACK = 14246,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_SUPPORTS = 14247,
|
||||
SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_TRACK = 14248,
|
||||
SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_SUPPORTS = 14249,
|
||||
SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_TRACK = 14250,
|
||||
SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_SUPPORTS = 14251,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_TRACK = 14252,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_SUPPORTS = 14253,
|
||||
SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_TRACK = 14254,
|
||||
SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_SUPPORTS = 14255,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_TRACK = 14256,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_SUPPORTS = 14257,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_TRACK = 14258,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_SUPPORTS = 14259,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_TRACK = 14260,
|
||||
SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_SUPPORTS = 14261,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_SPIRAL_SLIDE_TRACK = 14264,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_TRACK = 14266,
|
||||
SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_SUPPORTS = 14267,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_TRACK = 14268,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_SUPPORTS = 14269,
|
||||
SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_TRACK = 14270,
|
||||
SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS = 14271,
|
||||
SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK = 14272,
|
||||
SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS = 14273,
|
||||
SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK = 14274,
|
||||
SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS = 14275,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK = 14276,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS = 14277,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_FERRIS_WHEEL_TRACK = 14296,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_TOP_SPIN_TRACK = 14302,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_TRACK = 14306,
|
||||
SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_SUPPORTS = 14307,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LIFT_TRACK = 14308,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_TRACK = 14310,
|
||||
SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_SUPPORTS = 14311,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_TRACK = 14322,
|
||||
SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_SUPPORTS = 14323,
|
||||
SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_TRACK = 14324,
|
||||
SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_SUPPORTS = 14325,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_TRACK = 14326,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_SUPPORTS = 14327,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_TRACK = 14328,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_SUPPORTS = 14329,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_TRACK = 14330,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_SUPPORTS = 14331,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_TRACK = 14332,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_SUPPORTS = 14333,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_TRACK = 14336,
|
||||
SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_SUPPORTS = 14337,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_TRACK = 14340,
|
||||
SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_SUPPORTS = 14341,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_TRACK = 14342,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_SUPPORTS = 14343,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_TRACK = 14344,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_SUPPORTS = 14345,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_TRACK = 14346,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_SUPPORTS = 14347,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_TRACK = 14348,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_SUPPORTS = 14349,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_TRACK = 14352,
|
||||
SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_SUPPORTS = 14353,
|
||||
SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_TRACK = 14354,
|
||||
SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS = 14355,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK = 14356,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS = 14357,
|
||||
SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK = 14358,
|
||||
SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS = 14359,
|
||||
SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK = 14360,
|
||||
SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS = 14361,
|
||||
SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK = 14362,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_TRACK = 14366,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_SUPPORTS = 14367,
|
||||
SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_TRACK = 14368,
|
||||
SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_SUPPORTS = 14369,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_TRACK = 14370,
|
||||
SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_SUPPORTS = 14371,
|
||||
SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_TRACK = 14372,
|
||||
SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_SUPPORTS = 14373,
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_TRACK = 14374,
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_SUPPORTS = 14375,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_TRACK = 14376,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_SUPPORTS = 14377,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_TRACK = 14378,
|
||||
SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_SUPPORTS = 14379,
|
||||
SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_TRACK = 14380,
|
||||
SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_SUPPORTS = 14381,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_TRACK = 14394,
|
||||
SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_SUPPORTS = 14395,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_TRACK = 14396,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_SUPPORTS = 14397,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_TRACK = 14398,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_SUPPORTS = 14399,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_TRACK = 14402,
|
||||
SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_SUPPORTS = 14403,
|
||||
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAZE_BRICK_WALLS = 21990,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAZE_HEDGES = 21991,
|
||||
SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS = 21992,
|
||||
|
|
|
|||
|
|
@ -1140,6 +1140,106 @@ static const window_ride_maze_design_option MazeOptions[] = {
|
|||
{ STR_RIDE_DESIGN_MAZE_WOODEN_FENCES, SPR_RIDE_DESIGN_PREVIEW_MAZE_WOODEN_FENCES },
|
||||
};
|
||||
|
||||
typedef struct window_ride_colour_preview
|
||||
{
|
||||
uint32 track;
|
||||
uint32 supports;
|
||||
} window_ride_colour_preview;
|
||||
|
||||
static const window_ride_colour_preview TrackColourPreviews[] = {
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MONORAIL_TRACK, SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK, SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_TRACK, SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_TRACK, SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_TRACK, SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_SUPPORTS},
|
||||
{ 0, 0 }, // MAZE
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SPIRAL_SLIDE_TRACK, 0},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_TRACK, SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_TRACK, SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_TRACK, SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK, SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS},
|
||||
{ 0, 0 }, // FOOD_STALL
|
||||
{ 0, 0 }, // 1D
|
||||
{ 0, 0 }, // DRINK_STALL
|
||||
{ 0, 0 }, // 1F
|
||||
{ 0, 0 }, // SHOP
|
||||
{ 0, 0 }, // MERRY_GO_ROUND
|
||||
{ 0, 0 }, // 22
|
||||
{ 0, 0 }, // INFORMATION_KIOSK
|
||||
{ 0, 0 }, // TOILETS
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_FERRIS_WHEEL_TRACK, 0},
|
||||
{ 0, 0 }, // MOTION_SIMULATOR
|
||||
{ 0, 0 }, // 3D_CINEMA
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_TOP_SPIN_TRACK, 0},
|
||||
{ 0, 0 }, // SPACE_RINGS
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LIFT_TRACK, 0},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_SUPPORTS},
|
||||
{ 0, 0 }, // CASH_MACHINE
|
||||
{ 0, 0 }, // TWIST_TRACK
|
||||
{ 0, 0 }, // HAUNTED_HOUSE
|
||||
{ 0, 0 }, // FIRST_AID
|
||||
{ 0, 0 }, // CIRCUS_SHOW
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_TRACK, SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_TRACK, SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_SUPPORTS},
|
||||
{ 0, 0 }, // 38
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_SUPPORTS},
|
||||
{ 0, 0 }, // 3A
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_TRACK, SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_SUPPORTS},
|
||||
{ 0, 0 }, // 40
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK, SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK, 0},
|
||||
{ 0, 0 }, // CROOKED_HOUSE
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_TRACK, SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_TRACK, SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_TRACK, SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_SUPPORTS},
|
||||
{ 0, 0 }, // 50
|
||||
{ 0, 0 }, // ENTERPRISE
|
||||
{ 0, 0 }, // 52
|
||||
{ 0, 0 }, // 53
|
||||
{ 0, 0 }, // 54
|
||||
{ 0, 0 }, // 55
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_SUPPORTS},
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_SUPPORTS},
|
||||
{ 0, 0 }, // 59
|
||||
{ SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_SUPPORTS},
|
||||
};
|
||||
|
||||
static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex)
|
||||
{
|
||||
int widgetIndex = WIDX_TAB_1 + page;
|
||||
|
|
@ -4478,13 +4578,13 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
spriteIndex = MazeOptions[trackColour.supports].sprite;
|
||||
gfx_draw_sprite(dpi, spriteIndex, x, y, 0);
|
||||
} else {
|
||||
spriteIndex = 14222 + (ride->type * 2);
|
||||
spriteIndex = TrackColourPreviews[ride->type].track;
|
||||
spriteIndex |= (trackColour.additional << 24) | (trackColour.main << 19);
|
||||
spriteIndex |= 0xA0000000;
|
||||
gfx_draw_sprite(dpi, spriteIndex, x, y, 0);
|
||||
|
||||
// Supports
|
||||
spriteIndex = 14222 + (ride->type * 2) + 1;
|
||||
spriteIndex = TrackColourPreviews[ride->type].supports;
|
||||
spriteIndex |= trackColour.supports << 19;
|
||||
spriteIndex |= 0x20000000;
|
||||
gfx_draw_sprite(dpi, spriteIndex, x, y, 0);
|
||||
|
|
@ -4494,7 +4594,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
y = w->y + (widget->bottom + widget->top) / 2 - 6;
|
||||
|
||||
uint8 shopItem = rideEntry->shop_item_secondary == 255 ? rideEntry->shop_item : rideEntry->shop_item_secondary;
|
||||
spriteIndex = 5061 + shopItem;
|
||||
spriteIndex = ShopItemImage[shopItem];
|
||||
spriteIndex |= ride->track_colour_main[0] << 19;
|
||||
spriteIndex |= 0x20000000;
|
||||
|
||||
|
|
|
|||
|
|
@ -616,6 +616,28 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
gfx_draw_string_left(dpi, STR_STAFF_LIST_COUNTER, gCommonFormatArgs, 0, w->x + 4, window_staff_list_widgets[WIDX_STAFF_LIST_LIST].bottom + w->y + 2);
|
||||
}
|
||||
|
||||
/** rct2: 0x00992A08 */
|
||||
static const uint32 staffOrderBaseSprites[] = {
|
||||
SPR_STAFF_ORDERS_SWEEPING,
|
||||
SPR_STAFF_ORDERS_INSPECT_RIDES,
|
||||
0,
|
||||
0,
|
||||
};
|
||||
|
||||
static const uint32 staffCostumeSprites[] = {
|
||||
SPR_STAFF_COSTUME_PANDA,
|
||||
SPR_STAFF_COSTUME_TIGER,
|
||||
SPR_STAFF_COSTUME_ELEPHANT,
|
||||
SPR_STAFF_COSTUME_ROMAN,
|
||||
SPR_STAFF_COSTUME_GORILLA,
|
||||
SPR_STAFF_COSTUME_SNOWMAN,
|
||||
SPR_STAFF_COSTUME_KNIGHT,
|
||||
SPR_STAFF_COSTUME_ASTRONAUT,
|
||||
SPR_STAFF_COSTUME_BANDIT,
|
||||
SPR_STAFF_COSTUME_SHERIFF,
|
||||
SPR_STAFF_COSTUME_PIRATE,
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006BD785
|
||||
|
|
@ -657,13 +679,13 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
|
|||
|
||||
// True if a patrol path is set for the worker
|
||||
if (RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[peep->staff_id] & 2) {
|
||||
gfx_draw_sprite(dpi, 0x13FD, 110, y - 1, 0);
|
||||
gfx_draw_sprite(dpi, SPR_STAFF_PATROL_PATH, 110, y - 1, 0);
|
||||
}
|
||||
|
||||
staffOrderIcon_x = 0x7D;
|
||||
if (peep->staff_type != 3) {
|
||||
staffOrders = peep->staff_orders;
|
||||
staffOrderSprite = RCT2_ADDRESS(0x00992A08, uint32)[selectedTab];
|
||||
staffOrderSprite = staffOrderBaseSprites[selectedTab];
|
||||
|
||||
while (staffOrders != 0) {
|
||||
if (staffOrders & 1) {
|
||||
|
|
@ -671,10 +693,11 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
|
|||
}
|
||||
staffOrders = staffOrders >> 1;
|
||||
staffOrderIcon_x += 9;
|
||||
// TODO: Remove sprite ID addition
|
||||
staffOrderSprite++;
|
||||
}
|
||||
} else {
|
||||
gfx_draw_sprite(dpi, peep->sprite_type - 4 + 0x13FE, staffOrderIcon_x, y - 1, 0);
|
||||
gfx_draw_sprite(dpi, staffCostumeSprites[peep->sprite_type - 4], staffOrderIcon_x, y - 1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue