mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Merge branch 'MaciekBaron-master'

Browse Source
This commit is contained in:
IntelOrca
2014-05-02 22:24:29 +01:00
parent af5ef5e75d a872065a83
commit 1fdab25cb8
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/peep.h
View File

@@ -45,6 +45,32 @@ enum PEEP_THOUGHT_TYPE {
PEEP_THOUGHT_TYPE_NONE = 255
};
enum PEEP_STATE {
PEEP_STATE_QUEUING_FRONT = 2,
PEEP_STATE_ON_RIDE = 3,
PEEP_STATE_LEAVING_RIDE = 4,
PEEP_STATE_WALKING = 5,
PEEP_STATE_QUEUING = 6,
PEEP_STATE_ENTERING_RIDE = 7,
PEEP_STATE_SITTING = 8,
PEEP_STATE_PICKED = 9,
PEEP_STATE_PATROLLING = 10, // Not sure
PEEP_STATE_MOPING = 11,
PEEP_STATE_SWEEPING = 12,
PEEP_STATE_ENTERING_PARK = 13,
PEEP_STATE_LEAVING_PARK = 14,
PEEP_STATE_ANSWERING = 15,
PEEP_STATE_FIXING = 16,
PEEP_STATE_BUYING = 17,
PEEP_STATE_WATCHING = 18,
PEEP_STATE_EMPTYING_BIN = 19,
PEEP_STATE_WATERING = 21,
PEEP_STATE_HEADING_TO_INSPECTION = 22,
PEEP_STATE_INSPECTING = 23
};
typedef struct {
uint8 type;
uint8 item;

11
src/window_cheats.c
View File

@@ -31,6 +31,7 @@
#define WW 200
#define WH 128
#define CHEATS_MONEY_INCREMENT 10000
enum {
WINDOW_CHEATS_PAGE_MONEY,
@@ -195,7 +196,13 @@ static void window_cheats_money_mouseup()
break;
case WIDX_HIGH_MONEY:
i = DECRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, sint32));
i += 100000;
if (i < INT_MAX - CHEATS_MONEY_INCREMENT) {
i += CHEATS_MONEY_INCREMENT;
}
else {
i = INT_MAX;
}
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, sint32) = ENCRYPT_MONEY(i);
window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
break;
@@ -308,4 +315,4 @@ static void window_cheats_set_page(rct_window *w, int page)
w->widgets = window_cheats_page_widgets[page];
window_invalidate(w);
}
}