mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use constants for shop item images

This commit is contained in:
Marijn van der Werf 2016-07-28 23:18:05 +02:00
parent 9401afa68f
commit a17e6cee5e
3 changed files with 102 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/ride/ride_data.c
View File

@ -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 = {

50
src/sprites.h
View File

@ -37,6 +37,56 @@ 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_RIDE_CONSTRUCTION_STRAIGHT = 5137,
SPR_RIDE_CONSTRUCTION_LEFT_CURVE = 5138,

2
src/windows/ride.c
View File

@ -4594,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;