Cheats, temporary cheat placement macro for convenince, audio option, copiedunlimited land tool to water tool.

2025-12-27 09:42:55 +01:00 · 2014-07-15 22:41:12 -04:00
parent 44ef287fde
commit a9091b41b6
13 changed files with 324 additions and 61 deletions
--- a/src/audio.c
+++ b/src/audio.c
@@ -101,6 +101,7 @@ void pause_sounds() {
 		RCT2_CALLPROC_EBPSAFE(0x006BCA9F);
 		RCT2_CALLPROC_EBPSAFE(0x006BD07F);
 	}
+	sounds_is_paused = 1;
 }

 /**
@@ -109,4 +110,5 @@ void pause_sounds() {
 */
 void unpause_sounds() {
 	RCT2_GLOBAL(0x009AF59C, uint8)--;
+	sounds_is_paused = 0;
 }
--- a/src/audio.h
+++ b/src/audio.h
@@ -63,6 +63,8 @@ void sound_stop(rct_sound *sound);
 void pause_sounds();
 void unpause_sounds();

+int sounds_is_paused;
+
 typedef enum {
 	SOUND_LIFT_1 = 0,
 	SOUND_TRACK_FRICTION_1 = 1,
--- a/src/climate.c
+++ b/src/climate.c
@@ -84,6 +84,17 @@ void climate_reset(int climate)
 }


+//for cheats
+void climate_freeze()
+{
+	if (climate_frozen == 1){
+		climate_frozen = 0;
+	}
+	else{
+		climate_frozen = 1;
+	}
+}
+
 /**
 * Weather & climate update iteration.
 * Gradually changes the weather parameters towards their determined next values.
@@ -99,7 +110,9 @@ void climate_update()
 		next_gloom = _climateNextWeatherGloom,
 		cur_rain = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, sint8),
 		next_rain = _climateNextRainLevel;
-	
+
+	if (climate_frozen == 1) //for cheats
+		return;

 	if (screen_flags & (~SCREEN_FLAGS_PLAYING)) // only normal play mode gets climate
 		return;
--- a/src/climate.h
+++ b/src/climate.h
@@ -41,6 +41,9 @@ typedef struct {
 extern int gClimateNextWeather;
 extern const rct_weather climate_weather_data[6];

+int climate_frozen;
+void climate_freeze();
+
 int climate_celsius_to_fahrenheit(int celsius);
 void climate_reset(int climate);
 void climate_update();
--- a/src/game.c
+++ b/src/game.c
@@ -43,6 +43,7 @@
 #include "window_error.h"
 #include "window_tooltip.h"

+
 int _gameSpeed = 1;

 void game_handle_input();
@@ -1152,6 +1153,14 @@ void handle_shortcut_command(int shortcutIndex)
 		break;
 	}
 }
+void game_change_game_speed(int amount)
+{
+	//Sending 0 will reset to default
+	if (amount == 0)
+		_gameSpeed = 1;
+	else
+		_gameSpeed = max(1, min(8, _gameSpeed + amount));
+}

 /**
 * 
--- a/src/game.h
+++ b/src/game.h
@@ -27,6 +27,7 @@ void game_logic_update();
 void sub_0x0069E9A7(); 

 int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
+void game_change_game_speed(int amount); //for cheats

 void game_load_or_quit_no_save_prompt();
 int game_load_save();
--- a/src/park.c
+++ b/src/park.c
@@ -492,6 +492,12 @@ static rct_peep *park_generate_new_guest()
 	return peep;
 }

+//This is called via the cheat window.
+void generate_new_guest()
+{
+	park_generate_new_guest();
+}
+
 static rct_peep *park_generate_new_guest_due_to_campaign(int campaign)
 {
 	rct_peep *peep = park_generate_new_guest();
--- a/src/park.h
+++ b/src/park.h
@@ -52,6 +52,7 @@ int calculate_park_rating();
 money32 calculate_park_value();
 money32 calculate_company_value();
 void reset_park_entrances();
+void generate_new_guest();

 void park_update();
 void park_update_histories();
--- a/src/ride.h
+++ b/src/ride.h
@@ -322,7 +322,9 @@ enum {
 	RIDE_GROUP_SHOP
 };

-#define MAX_RIDES 255
+#define MAX_RIDES 500
+
+//#define MAX_RIDES 255
 #define MAX_RIDE_MEASUREMENTS 8
 #define RIDE_RELIABILITY_UNDEFINED 0xFFFF

--- a/src/sprites.h
+++ b/src/sprites.h
@@ -217,6 +217,7 @@ enum {
 	SPR_TAB_OBJECTIVE_15 = SPR_TAB_OBJECTIVE_0 + 15,

 	SPR_TAB_AWARDS = 5527,
+	SPR_TAB_QUESTION = 5528,

 	SPR_TAB_GUESTS_0 = 5568,
 	SPR_TAB_GUESTS_1 = SPR_TAB_GUESTS_0 + 1,
--- a/src/window_cheats.c
+++ b/src/window_cheats.c
@@ -29,15 +29,19 @@
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
+#include "climate.h"
+#include "ride.h"
+#include "scenario.h"
+#include "game.h"

-
-#define WW 200
-#define WH 128
-#define CHEATS_MONEY_INCREMENT 10000
-
+//#define WW 200
+//#define WH 128
+#define CHEATS_MONEY_INCREMENT 50000
+#define CHEATS_TRAM_INCREMENT 1000
 enum {
 	WINDOW_CHEATS_PAGE_MONEY,
-	WINDOW_CHEATS_PAGE_GUESTS
+	WINDOW_CHEATS_PAGE_GUESTS,
+	WINDOW_CHEATS_PAGE_MISC,
 };

 enum WINDOW_CHEATS_WIDGET_IDX {
@@ -47,42 +51,87 @@ enum WINDOW_CHEATS_WIDGET_IDX {
 	WIDX_PAGE_BACKGROUND,
 	WIDX_TAB_1,
 	WIDX_TAB_2,
+	WIDX_TAB_3,
 	WIDX_HIGH_MONEY,
 	WIDX_PARK_ENTRANCE_FEE,
-	WIDX_HAPPY_GUESTS = 6 //Same as HIGH_MONEY as it is also the 6th widget but on a different page
+	WIDX_HAPPY_GUESTS = 7, //Same as HIGH_MONEY as it is also the 7th widget but on a different page
+	WIDX_TRAM_GUESTS,
+	WIDX_FREEZE_CLIMATE = 7,
+	WIDX_FAST_STAFF,
+	WIDX_OPEN_CLOSE_PARK,
+	WIDX_DECREASE_GAME_SPEED,
+	WIDX_INCREASE_GAME_SPEED,
+	
 };

+#pragma region MEASUREMENTS
+#define WW 240
+#define WH 240
+#define YSPA 4
+#define XSPA 4
+#define XOS XSPA
+#define YOS 43 + YSPA
+#define BTNW 120 - (XOS * 2)
+#define BTNH 16
+#define YPL(YIND) YOS + ((BTNH + YSPA) * YIND)
+#define HPL(YIND) YPL(YIND) + BTNH
+#define XPL(XIND) XOS + ((BTNW + XSPA) * XIND)
+#define WPL(XIND) XPL(XIND) + BTNW
+#pragma endregion
+
 static rct_widget window_cheats_money_widgets[] = {
-	{ WWT_FRAME,			0,	0,			WW - 1,	0,		WH - 1,	0x0FFFFFFFF,	65535},					// panel / background
-	{ WWT_CAPTION,			0,	1,			WW - 2,	1,		14,		3165,			STR_WINDOW_TITLE_TIP},	// title bar
-	{ WWT_CLOSEBOX,			0,	WW - 13,	WW - 3,	2,		13,		0x338,			STR_CLOSE_WINDOW_TIP},	// close x button
-	{ WWT_IMGBTN,			1,	0,			WW - 1,	43,		WH - 1,	0x0FFFFFFFF,	65535},					// tab content panel
-	{ WWT_TAB,				1,	3,			33,		17,		43,		0x2000144E,		2462},					// tab 1
-	{ WWT_TAB,				1,	34,			64,		17,		43,		0x2000144E,		2462},					// tab 2
-	{ WWT_CLOSEBOX,			1,	4,			74,		67,		83,		STR_VERY_HIGH,	STR_VERY_HIGH},			// high money
-	{ WWT_CLOSEBOX,			1,	4,			74,		107,	123,	STR_FREE,		STR_FREE},				//Park Entrance Fee Toggle	
+	{ WWT_FRAME,			0,	0,			WW - 1,	0,		WH - 1,		0x0FFFFFFFF,	65535},					// panel / background
+	{ WWT_CAPTION,			0,	1,			WW - 2,	1,		14,			3165,			STR_WINDOW_TITLE_TIP},	// title bar
+	{ WWT_CLOSEBOX,			0,	WW - 13,	WW - 3,	2,		13,			0x338,			STR_CLOSE_WINDOW_TIP},	// close x button
+	{ WWT_IMGBTN,			1,	0,			WW - 1,	43,		WH - 1,		0x0FFFFFFFF,	65535},					// tab content panel
+	{ WWT_TAB,				1,	3,			33,		17,		43,			0x2000144E,		2462},					// tab 1
+	{ WWT_TAB,				1,	34,			64,		17,		43,			0x2000144E,		2462},					// tab 2
+	{ WWT_TAB,				1,	65,			95,		17,		43,			0x2000144E,		2462},					// tab 3
+	{ WWT_CLOSEBOX,			1,	XPL(0),		WPL(0),	YPL(1),	HPL(1),		STR_VERY_HIGH,	STR_VERY_HIGH},			// high money
+	{ WWT_CLOSEBOX,			1,	XPL(0),		WPL(0),	YPL(3),	HPL(3),		STR_FREE,		STR_FREE},				//Park Entrance Fee Toggle	
 	{ WIDGETS_END },
 };

 static rct_widget window_cheats_guests_widgets[] = {
-	{ WWT_FRAME,			0, 0,			WW - 1, 0,	WH - 1,		0x0FFFFFFFF,	65535 },				// panel / background
-	{ WWT_CAPTION,			0, 1,			WW - 2, 1,	14,			3165,			STR_WINDOW_TITLE_TIP },	// title bar
-	{ WWT_CLOSEBOX,			0, WW - 13,		WW - 3, 2,	13,			0x338,			STR_CLOSE_WINDOW_TIP },	// close x button
-	{ WWT_IMGBTN,			1, 0,			WW - 1, 43, WH - 1,		0x0FFFFFFFF,	65535 },				// tab content panel
-	{ WWT_TAB,				1, 3,			33,		17, 43,			0x2000144E,		2462 },					// tab 1
-	{ WWT_TAB,				1, 34,			64,		17, 43,			0x2000144E,		2462 },					// tab 2
-	{ WWT_CLOSEBOX,			1, 4,			74,		77, 93,			STR_EXTREME,	STR_EXTREME},					// happy guests
+	{ WWT_FRAME,			0, 0,			WW - 1, 0,	WH - 1,		0x0FFFFFFFF,	65535 },					// panel / background
+	{ WWT_CAPTION,			0, 1,			WW - 2, 1,	14,			3165,			STR_WINDOW_TITLE_TIP },		// title bar
+	{ WWT_CLOSEBOX,			0, WW - 13,		WW - 3, 2,	13,			0x338,			STR_CLOSE_WINDOW_TIP },		// close x button
+	{ WWT_IMGBTN,			1, 0,			WW - 1, 43, WH - 1,		0x0FFFFFFFF,	65535 },					// tab content panel
+	{ WWT_TAB,				1, 3,			33,		17, 43,			0x2000144E,		2462 },						// tab 1
+	{ WWT_TAB,				1, 34,			64,		17, 43,			0x2000144E,		2462 },						// tab 2
+	{ WWT_TAB,				1,	65,			95,		17,		43,		0x2000144E,		2462 },						// tab 3
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(1), HPL(1),		STR_EXTREME,	STR_EXTREME},				// happy guests
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(3), HPL(3),		STR_NONE,		STR_NONE},					// happy guests
+	{ WIDGETS_END },
+};
+
+//Strings for following moved to window_cheats_paint()
+static rct_widget window_cheats_misc_widgets[] = {
+	{ WWT_FRAME,			0, 0,			WW - 1, 0,	WH - 1,		0x0FFFFFFFF,	65535 },					// panel / background
+	{ WWT_CAPTION,			0, 1,			WW - 2, 1,	14,			3165,			STR_WINDOW_TITLE_TIP },		// title bar
+	{ WWT_CLOSEBOX,			0, WW - 13,		WW - 3, 2,	13,			0x338,			STR_CLOSE_WINDOW_TIP },		// close x button
+	{ WWT_IMGBTN,			1, 0,			WW - 1, 43, WH - 1,		0x0FFFFFFFF,	65535 },					// tab content panel
+	{ WWT_TAB,				1, 3,			33,		17, 43,			0x2000144E,		2462 },						// tab 1
+	{ WWT_TAB,				1, 34,			64,		17, 43,			0x2000144E,		2462 },						// tab 2
+	{ WWT_TAB,				1,	65,			95,		17,		43,		0x2000144E,		2462},					// tab 3
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(0), HPL(0),		STR_NONE,		STR_NONE},					// Freeze climate
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(1), HPL(1),		STR_NONE,		STR_NONE},					// open / close park
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(2), HPL(2),		STR_NONE,		STR_NONE},					// fast staff
+	{ WWT_CLOSEBOX,			1, XPL(0),	WPL(0),	YPL(3), HPL(3),		STR_NONE,		STR_NONE},					// decrease game speed
+	{ WWT_CLOSEBOX,			1, XPL(1),	WPL(1),	YPL(3), HPL(3),		STR_NONE,		STR_NONE},					// increase game speed
 	{ WIDGETS_END },
 };

 static rct_widget *window_cheats_page_widgets[] = {
 	window_cheats_money_widgets,
-	window_cheats_guests_widgets
+	window_cheats_guests_widgets,
+	window_cheats_misc_widgets,
 };

 static void window_cheats_emptysub() { }
 static void window_cheats_money_mouseup();
 static void window_cheats_guests_mouseup();
+static void window_cheats_misc_mouseup();
 static void window_cheats_update(rct_window *w);
 static void window_cheats_invalidate();
 static void window_cheats_paint();
@@ -150,14 +199,47 @@ static void* window_cheats_guests_events[] = {
 	window_cheats_emptysub
 };

+static void* window_cheats_misc_events[] = {
+	window_cheats_emptysub,
+	window_cheats_misc_mouseup,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_update,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_emptysub,
+	window_cheats_invalidate,
+	window_cheats_paint,
+	window_cheats_emptysub
+};
+
 static void* window_cheats_page_events[] = {
 	window_cheats_money_events,
 	window_cheats_guests_events,
+	window_cheats_misc_events,
 };

 static uint32 window_cheats_page_enabled_widgets[] = {
 	(1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_HIGH_MONEY) | (1 << WIDX_PARK_ENTRANCE_FEE),
-	(1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_HAPPY_GUESTS) 
+	(1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_HAPPY_GUESTS) | (1 << WIDX_TRAM_GUESTS),
+	(1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_FREEZE_CLIMATE) | (1 << WIDX_OPEN_CLOSE_PARK) | (1 << WIDX_DECREASE_GAME_SPEED) | (1 << WIDX_INCREASE_GAME_SPEED),
 };

 static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w);
@@ -206,6 +288,7 @@ static void window_cheats_money_mouseup()
 		break;
 	case WIDX_TAB_1:
 	case WIDX_TAB_2:
+	case WIDX_TAB_3:
 		window_cheats_set_page(w, widgetIndex - WIDX_TAB_1);
 		break;
 	case WIDX_HIGH_MONEY:
@@ -233,7 +316,7 @@ static void window_cheats_guests_mouseup()
 {
 	short widgetIndex;
 	rct_window *w;
-
+	int i;
 	#ifdef _MSC_VER
 	__asm mov widgetIndex, dx
 	#else
@@ -255,6 +338,7 @@ static void window_cheats_guests_mouseup()
 		break;
 	case WIDX_TAB_1:
 	case WIDX_TAB_2:
+	case WIDX_TAB_3:
 		window_cheats_set_page(w, widgetIndex - WIDX_TAB_1);
 		break;
 	case WIDX_HAPPY_GUESTS:
@@ -263,6 +347,82 @@ static void window_cheats_guests_mouseup()
 				peep->happiness = 255;
 		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
 		break;
+	case WIDX_TRAM_GUESTS:
+		i = 0;
+		for (i = 0; i < CHEATS_TRAM_INCREMENT; i++){
+			generate_new_guest();
+		}
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+	}
+}
+
+static void window_cheats_misc_mouseup()
+{
+	short widgetIndex;
+	rct_window *w;
+	int i;
+	rct_ride *ride;
+	#ifdef _MSC_VER
+	__asm mov widgetIndex, dx
+	#else
+	__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
+	#endif
+
+	#ifdef _MSC_VER
+	__asm mov w, esi
+	#else
+	__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
+	#endif
+
+	rct_peep* peep;
+	uint16 spriteIndex;
+
+	switch (widgetIndex) {
+	case WIDX_CLOSE:
+		window_close(w);
+		break;
+	case WIDX_TAB_1:
+	case WIDX_TAB_2:
+	case WIDX_TAB_3:
+		window_cheats_set_page(w, widgetIndex - WIDX_TAB_1);
+		break;
+	case WIDX_FREEZE_CLIMATE:
+		climate_freeze();
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+	case WIDX_FAST_STAFF:
+		FOR_ALL_GUESTS(spriteIndex, peep)
+			if (peep->var_2A == 0)
+				peep->happiness = 255;
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+	case WIDX_OPEN_CLOSE_PARK:
+		//No clue why the ; needs to be at the beginning, but otherwise it doesn't go through.
+		;int dropdownIndex = !park_is_open();
+		if (dropdownIndex == -1)
+			dropdownIndex = RCT2_GLOBAL(0x009DEBA2, sint16);
+		if (dropdownIndex != 0) {
+			dropdownIndex &= 0x00FF;
+			dropdownIndex |= 0x0100;
+			RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = 1724;
+		}
+		else {
+			dropdownIndex &= 0x00FF;
+			RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = 1723;
+		}
+		game_do_command(0, 1, 0, dropdownIndex, 34, 0, 0);
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+	case WIDX_DECREASE_GAME_SPEED:
+		game_change_game_speed(-1);
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+	case WIDX_INCREASE_GAME_SPEED:
+		game_change_game_speed(1);
+		window_invalidate_by_id(0x40 | WC_BOTTOM_TOOLBAR, 0);
+		break;
+
 	}
 }

@@ -305,6 +465,7 @@ static void window_cheats_invalidate()
 	w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
 }

+#define TXTO 3
 static void window_cheats_paint()
 {
 	rct_window *w;
@@ -329,20 +490,38 @@ static void window_cheats_paint()
 	if (w->page == WINDOW_CHEATS_PAGE_MONEY){
 		char buffer[256];
 		// Format text
-		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases your money by 1,000.");
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases your money by 5,000.");
 		// Draw shadow
-		gfx_draw_string(dpi, buffer, 0, w->x + 4, w->y + 50);
-
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
+		
 		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Toggle between Free and Paid Entry");
 		// Draw shadow
-		gfx_draw_string(dpi, buffer, 0, w->x + 4, w->y + 90);
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
 	}
 	else if (w->page == WINDOW_CHEATS_PAGE_GUESTS){
 		char buffer[256];
 		// Format text
-		sprintf(buffer, "%c%c%s%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases every peeps happiness ", FORMAT_NEWLINE, "to max.");
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases every peeps happiness to max.");
 		// Draw shadow
 		gfx_draw_string(dpi, buffer, 0, w->x + 4, w->y + 50);
+
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Large group of peeps arrive");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(2) + 3);
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Large Tram");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(3) + 3);
+	}
+	else if (w->page == WINDOW_CHEATS_PAGE_MISC){
+		char buffer[256];
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Freeze climate");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(0) + 3);
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Fast staff");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(1) + 3);
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Open/Close Park");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(2) + 3);
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Slower Gamespeed");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + 3, w->y + YPL(3) + 3);
+		sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_WINDOW_COLOUR_2, "Faster Gamespeed");
+		gfx_draw_string(dpi, buffer, 0, w->x + XPL(1) + 3, w->y + YPL(3) + 3);
 	}

 }
@@ -358,7 +537,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
 			sprite_idx += (w->var_48E / 2) % 8;
 		gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_1].left, w->y + w->widgets[WIDX_TAB_1].top);	
 	}
-
+	
 	// Guests tab
 	if (!(w->disabled_widgets & (1 << WIDX_TAB_2))) {
 		sprite_idx = 5568;
@@ -366,6 +545,12 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
 			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);
 	}
+
+	// Misc tab
+	if (!(w->disabled_widgets & (1 << WIDX_TAB_3))) {
+		sprite_idx = SPR_TAB_QUESTION;
+		gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_3].left, w->y + w->widgets[WIDX_TAB_3].top);
+	}
 }

 static void window_cheats_set_page(rct_window *w, int page)
--- a/src/window_options.c
+++ b/src/window_options.c
@@ -42,6 +42,7 @@ enum WINDOW_OPTIONS_WIDGET_IDX {
 	WIDX_SOUND_QUALITY,
 	WIDX_SOUND_QUALITY_DROPDOWN,
 	WIDX_SOUND_SW_BUFFER_CHECKBOX,
+	WIDX_SOUND_PAUSED_CHECKBOX,
 	WIDX_UNITS_GROUP,
 	WIDX_CURRENCY,
 	WIDX_CURRENCY_DROPDOWN,
@@ -67,10 +68,10 @@ enum WINDOW_OPTIONS_WIDGET_IDX {
 };

 static rct_widget window_options_widgets[] = {
-	{ WWT_FRAME,			0,	0,		309,	0,		371,	STR_NONE,		STR_NONE },
+	{ WWT_FRAME,			0,	0,		309,	0,		383,	STR_NONE,		STR_NONE },
 	{ WWT_CAPTION,			0,	1,		308,	1,		14,		STR_OPTIONS,	STR_WINDOW_TITLE_TIP },
 	{ WWT_CLOSEBOX,			0,	297,	307,	2,		13,		STR_CLOSE_X,	STR_CLOSE_WINDOW_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	17,		93,		STR_SOUND,		STR_NONE },
+	{ WWT_GROUPBOX,			0,	3,		306,	17,		105,	STR_SOUND,		STR_NONE },
 	{ WWT_DROPDOWN,			0,	10,		299,	31,		42,		0x361,			STR_NONE },	// sound
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	32,		41,		0x36C,			STR_NONE },
 	{ WWT_DROPDOWN,			0,	155,	299,	46,		57,		0x365,			STR_NONE },	// music
@@ -78,28 +79,29 @@ static rct_widget window_options_widgets[] = {
 	{ WWT_DROPDOWN,			0,	155,	299,	61,		72,		0x366,			STR_NONE },	// sound quality
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	62,		71,		0x36C,			STR_NONE },
 	{ WWT_CHECKBOX,			0,	10,		299,	76,		87,		STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING, STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	100,	176,	STR_UNITS,		STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	114,	125,	0x367,			STR_NONE },	// currency
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	115,	124,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	129,	140,	0x368,			STR_NONE },	// distance
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	130,	139,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	144,	155,	0x36B,			STR_NONE },	// temperature
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	145,	154,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	159,	170,	0x364,			STR_NONE },	// height labels
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	160,	169,	0x36C,			STR_NONE },
-	{ WWT_GROUPBOX,			0,	3,		306,	182,	258,	STR_DISPLAY,	STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	196,	207,	0x348,			STR_NONE },	// resolution
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	197,	206,	0x36C,			STR_NONE },
-	{ WWT_CHECKBOX,			0,	10,		299,	212,	223,	STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP },
-	{ WWT_CHECKBOX,			0,	10,		299,	227,	238,	STR_GRIDLINES,	STR_GRIDLINES_TIP },
-	{ WWT_DROPDOWN,			0,	155,	299,	241,	252,	STR_NONE,		STR_NONE },	// construction marker
-	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	242,	251,	0x36C,			STR_NONE },
-	{ WWT_GROUPBOX,			0,	3,		306,	264,	310,	STR_CONTROLS,	STR_NONE },
-	{ WWT_CHECKBOX,			2,	10,		299,	279,	290,	STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP },
-	{ WWT_DROPDOWN_BUTTON,	0,	26,		185,	293,	304,	STR_HOTKEY,		STR_HOTKEY_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	317,	365,	STR_GENERAL,	STR_NONE },
-	{ WWT_CHECKBOX,			2,	10,		299,	331,	342,	STR_REAL_NAME,	STR_REAL_NAME_TIP },
-	{ WWT_CHECKBOX,			2,	10,		299,	346,	357,	STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP },
+	{ WWT_CHECKBOX,			0,	10,		229,	88,		99,		STR_SOUND,		STR_NONE }, // pause/unpause sound
+	{ WWT_GROUPBOX,			0,	3,		306,	112,	188,	STR_UNITS,		STR_NONE }, 
+	{ WWT_DROPDOWN,			0,	155,	299,	126,	137,	0x367,			STR_NONE },	// currency
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	127,	136,	0x36C,			STR_NONE },//
+	{ WWT_DROPDOWN,			0,	155,	299,	141,	152,	0x368,			STR_NONE },	// distance
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	142,	151,	0x36C,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	156,	168,	0x36B,			STR_NONE },	// temperature
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	157,	166,	0x36C,			STR_NONE }, //jjj
+	{ WWT_DROPDOWN,			0,	155,	299,	171,	182,	0x364,			STR_NONE },	// height labels
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	172,	181,	0x36C,			STR_NONE },
+	{ WWT_GROUPBOX,			0,	3,		306,	194,	270,	STR_DISPLAY,	STR_NONE },//
+	{ WWT_DROPDOWN,			0,	155,	299,	208,	219,	0x348,			STR_NONE },	// resolution
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	209,	218,	0x36C,			STR_NONE },
+	{ WWT_CHECKBOX,			0,	10,		299,	224,	235,	STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP },
+	{ WWT_CHECKBOX,			0,	10,		299,	239,	250,	STR_GRIDLINES,	STR_GRIDLINES_TIP },
+	{ WWT_DROPDOWN,			0,	155,	299,	253,	264,	STR_NONE,		STR_NONE },	// construction marker
+	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	254,	263,	0x36C,			STR_NONE },
+	{ WWT_GROUPBOX,			0,	3,		306,	276,	322,	STR_CONTROLS,	STR_NONE },
+	{ WWT_CHECKBOX,			2,	10,		299,	291,	302,	STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP },
+	{ WWT_DROPDOWN_BUTTON,	0,	26,		185,	306,	316,	STR_HOTKEY,		STR_HOTKEY_TIP },
+	{ WWT_GROUPBOX,			0,	3,		306,	329,	377,	STR_GENERAL,	STR_NONE },
+	{ WWT_CHECKBOX,			2,	10,		299,	343,	354,	STR_REAL_NAME,	STR_REAL_NAME_TIP },
+	{ WWT_CHECKBOX,			2,	10,		299,	357,	369,	STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP },
 	{ WIDGETS_END },
 };

@@ -184,6 +186,7 @@ void window_options_open()
 		(1 << WIDX_TILE_SMOOTHING_CHECKBOX) |
 		(1 << WIDX_GRIDLINES_CHECKBOX) |
 		(1 << WIDX_SOUND_SW_BUFFER_CHECKBOX) |
+		(1 << WIDX_SOUND_PAUSED_CHECKBOX) |
 		(1ULL << WIDX_SAVE_PLUGIN_DATA_CHECKBOX);	// doesn't seem to work?

 	window_init_scroll_widgets(w);
@@ -283,6 +286,15 @@ static void window_options_mouseup()
 		unpause_sounds();
 		window_invalidate(w);
 		break;
+	case WIDX_SOUND_PAUSED_CHECKBOX:
+		if (sounds_is_paused == 0){
+			pause_sounds();
+		}
+		else{
+			unpause_sounds();
+		}
+		window_invalidate(w);
+		break;
 	}
 }

@@ -558,6 +570,12 @@ static void window_options_update(rct_window *w)
 	window_options_widgets[WIDX_CONSTRUCTION_MARKER].image = STR_WHITE +
 		RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CONSTRUCTION_MARKER, uint8);
 	
+	//Sound pause checkbox
+	if (sounds_is_paused)
+		w->pressed_widgets |= (1 << WIDX_SOUND_PAUSED_CHECKBOX);
+	else
+		w->pressed_widgets &= ~(1 << WIDX_SOUND_PAUSED_CHECKBOX);
+		
 	// sound software mixing buffer checkbox
 	if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_SOUND_SW_BUFFER, uint8))
 		w->pressed_widgets |= (1 << WIDX_SOUND_SW_BUFFER_CHECKBOX);
--- a/src/window_water.c
+++ b/src/window_water.c
@@ -150,8 +150,8 @@ static void window_water_mouseup()
 	case WIDX_DECREMENT:
 		// Decrement land tool size
 		RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)--;
-		limit = 1;
-
+		//limit = 1;
+		limit = 0;
 		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) < limit)
 			RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = limit;

@@ -163,7 +163,8 @@ static void window_water_mouseup()
 		RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)++;

 		// FEATURE: maximum size is always 7
-		limit = 7;
+		//limit = 7;
+		limit = 64;
 		// limit = (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & 2 ? 7 : 5);
 		
 		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) > limit)
@@ -205,7 +206,12 @@ static void window_water_invalidate()
 	w->pressed_widgets |= (1 << WIDX_PREVIEW);

 	// Update the preview image
-	window_water_widgets[WIDX_PREVIEW].image = SPR_LAND_TOOL_SIZE_0 + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+	//window_water_widgets[WIDX_PREVIEW].image = SPR_LAND_TOOL_SIZE_0 + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+
+	window_water_widgets[WIDX_PREVIEW].image = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) <= 7 ?
+		SPR_LAND_TOOL_SIZE_0 + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) :
+		0xFFFFFFFF;
+
 }

 /**
@@ -230,8 +236,20 @@ static void window_water_paint()
 	__asm__ ( "mov %[dpi], edi " : [dpi] "+m" (dpi) );
 	#endif

+	x = w->x + (window_water_widgets[WIDX_PREVIEW].left + window_water_widgets[WIDX_PREVIEW].right) / 2;
+	y = w->y + (window_water_widgets[WIDX_PREVIEW].top + window_water_widgets[WIDX_PREVIEW].bottom) / 2;

 	window_draw_widgets(w, dpi);
+	// FEATURE larger land tool size support
+	if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) > 7) {
+		RCT2_GLOBAL(0x009BC677, char) = FORMAT_BLACK;
+		RCT2_GLOBAL(0x009BC678, char) = FORMAT_COMMA16;
+		RCT2_GLOBAL(0x009BC679, char) = 0;
+		RCT2_GLOBAL(0x013CE952, sint16) = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+		gfx_draw_string_centred(dpi, 3165, x, y - 2, 0, (void*)0x013CE952);
+	}
+	y = w->y + window_water_widgets[WIDX_PREVIEW].bottom + 5;
+

 	// Draw raise cost amount
 	x = (window_water_widgets[WIDX_PREVIEW].left + window_water_widgets[WIDX_PREVIEW].right) / 2 + w->x;
@@ -243,6 +261,8 @@ static void window_water_paint()
 	// Draw lower cost amount
 	if (RCT2_GLOBAL(RCT2_ADDRESS_WATER_LOWER_COST, uint32) != MONEY32_UNDEFINED && RCT2_GLOBAL(RCT2_ADDRESS_WATER_LOWER_COST, uint32) != 0)
 		gfx_draw_string_centred(dpi, 985, x, y, 0, (void*)RCT2_ADDRESS_WATER_LOWER_COST);
+
+
 }

 /**