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

Merge branch 'duncanspumpkin-master'

This commit is contained in:
IntelOrca 2014-05-03 10:40:21 +01:00
parent a69e5c9911 c6c44b5df2
commit 92d24a46c4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/peep.h
View File

@ -118,11 +118,11 @@ typedef struct {
uint8 bathroom; // 0x40
uint8 pad_041[0x27];
uint8 current_ride; // 0x68
uint8 pad_6A; // 0x6A Part of current_ride?
uint8 current_train; // 0x6B
uint8 current_car; // 0x6C
uint8 current_seat; // 0x6D
uint8 pad_6E[0x0E];
uint8 pad_69;
uint8 current_train; // 0x6A
uint8 current_car; // 0x6B
uint8 current_seat; // 0x6C
uint8 pad_6D[0x0F];
uint8 rides_been_on[32]; // 0x7C
uint32 id; // 0x9C
sint32 cash_in_pocket; // 0xA0
@ -132,13 +132,13 @@ typedef struct {
uint16 pad_C4;
uint8 var_C6;
uint8 pad_C7;
uint32 var_C8; // Bit 11 tracking, Bit 8 leaving the park
uint8 var_CC; // Bit 0 mad, bit 1 Ice Cream
uint8 pad_CD[0x18];
uint16 paid_to_enter; // 0xE5
uint16 paid_on_rides; // 0xE7
uint16 paid_on_food; // 0xE9
uint16 paid_on_souvenirs; // 0xEB
uint32 var_C8; // Bit 25 Ice Cream, Bit 24 mad, Bit 3 tracking, Bit 0 leaving the park
uint8 var_CC;
uint8 pad_CD[0x17];
uint16 paid_to_enter; // 0xE4
uint16 paid_on_rides; // 0xE6
uint16 paid_on_food; // 0xE8
uint16 paid_on_souvenirs; // 0xEA
uint8 no_of_food; // 0xEC
uint8 no_of_drinks; // 0xED
uint8 no_of_souvenirs; // 0xEE

2
src/window_cheats.c
View File

@ -300,7 +300,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
if (!(w->disabled_widgets & (1 << WIDX_TAB_2))) {
sprite_idx = 5568;
if (w->page == WINDOW_CHEATS_PAGE_GUESTS)
sprite_idx += (w->var_48E / 2) % 8;
sprite_idx += (w->var_48E / 3) % 8;
gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_2].left, w->y + w->widgets[WIDX_TAB_2].top);
}
}