From 8da8519b6f3e19078e6ed77d207f6ab04c984a2b Mon Sep 17 00:00:00 2001 From: Maciek Baron Date: Fri, 2 May 2014 21:07:20 +0100 Subject: [PATCH 1/2] Capping money in cheats --- src/window_cheats.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/window_cheats.c b/src/window_cheats.c index 8e09e207cc..d04b70c2b4 100644 --- a/src/window_cheats.c +++ b/src/window_cheats.c @@ -28,6 +28,7 @@ #define WW 200 #define WH 128 +#define CHEATS_MONEY_INCREMENT 10000 enum { WINDOW_CHEATS_PAGE_MONEY, @@ -129,7 +130,13 @@ static void window_cheats_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); From ca81c5e06d6281fbec485b85552de93931334307 Mon Sep 17 00:00:00 2001 From: Maciek Baron Date: Fri, 2 May 2014 21:07:48 +0100 Subject: [PATCH 2/2] Adding enum with peep states --- src/peep.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/peep.h b/src/peep.h index 62f8b75602..6f0af308d7 100644 --- a/src/peep.h +++ b/src/peep.h @@ -38,6 +38,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;