Finished improvements to console

Added commands: variables, get, and set
Added console scrolling
set console_small_font 1 will change the console font
Fixed issue with textinput incrementing the length twice in shared.c

src/config.c

@@ -169,6 +169,7 @@ config_property_definition _interfaceDefinitions[] = {
 	{ offsetof(interface_configuration, toolbar_show_cheats),			"toolbar_show_cheats",			CONFIG_VALUE_TYPE_BOOLEAN,		false,							NULL					},
 	{ offsetof(interface_configuration, allow_subtype_switching),		"allow_subtype_switching",		CONFIG_VALUE_TYPE_BOOLEAN,		false,							NULL					},
 	{ offsetof(interface_configuration, rct1_colour_scheme),			"rct1_colour_scheme",			CONFIG_VALUE_TYPE_BOOLEAN,		false,							NULL					},
+	{ offsetof(interface_configuration, console_small_font),			"console_small_font",			CONFIG_VALUE_TYPE_BOOLEAN,		false,							NULL					},
 };
 
 config_property_definition _soundDefinitions[] = {

src/config.h

@@ -138,6 +138,7 @@ typedef struct {
 	uint8 toolbar_show_cheats;
 	uint8 allow_subtype_switching;
 	uint8 rct1_colour_scheme;
+	uint8 console_small_font;
 } interface_configuration;
 
 typedef struct {

src/interface/console.c

@@ -4,11 +4,17 @@
 #include "../drawing/drawing.h"
 #include "../localisation/localisation.h"
 #include "../platform/platform.h"
+#include "../world/park.h"
+#include "../config.h"
+#include "../cursors.h"
+#include "../game.h"
+#include "../input.h"
 #include "../object.h"
 #include "console.h"
 #include "window.h"
 
-#define CONSOLE_BUFFER_SIZE 1024
+#define CONSOLE_BUFFER_SIZE 8192
+#define CONSOLE_BUFFER_2_SIZE 256
 #define CONSOLE_HISTORY_SIZE 64
 #define CONSOLE_INPUT_SIZE 256
 
@@ -23,7 +29,9 @@ static char *_consoleViewBufferStart = _consoleBuffer;
 static char _consoleCurrentLine[CONSOLE_INPUT_SIZE];
 static char *_consoleCurrentLinePointer = _consoleCurrentLine;
 static int _consoleCaretTicks;
-static char _consolePrintfBuffer[CONSOLE_BUFFER_SIZE];
+static char _consolePrintfBuffer[CONSOLE_BUFFER_2_SIZE];
+static char _consoleErrorBuffer[CONSOLE_BUFFER_2_SIZE];
+static int _consoleScrollPos = 0;
 
 static char _consoleHistory[CONSOLE_HISTORY_SIZE][CONSOLE_INPUT_SIZE];
 static int _consoleHistoryIndex = 0;
@@ -35,12 +43,18 @@ static void console_update_scroll();
 static void console_clear_input();
 static void console_history_add(const char *src);
 static void console_write_all_commands();
+static int console_parse_int(const char *src, bool *valid);
+static double console_parse_double(const char *src, bool *valid);
 
+static int cc_variables(const char **argv, int argc);
 static int cc_help(const char **argv, int argc);
 
+#define SET_FLAG(variable, flag, value) {if (value) variable |= flag; else variable &= ~flag;}
+
 void console_open()
 {
 	gConsoleOpen = true;
+	_consoleScrollPos = 0;
 	console_refresh_carot();
 	console_update_scroll();
 	platform_start_text_input(_consoleCurrentLine, sizeof(_consoleCurrentLine));
@@ -77,7 +91,7 @@ void console_update()
 	_consoleLeft = 0;
 	_consoleTop = 0;
 	_consoleRight = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16);
-	_consoleBottom = 300;
+	_consoleBottom = 322;
 
 	if (gConsoleOpen) {
 		console_invalidate();
@@ -113,20 +127,30 @@ void console_draw(rct_drawpixelinfo *dpi)
 {
 	if (!gConsoleOpen)
 		return;
+	int lines = 0;
+	int maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1;
+	char *ch = strchr(_consoleBuffer, 0);
+	while (ch > _consoleBuffer) {
+		ch--;
+		if (*ch == '\n')
+			lines++;
+	}
 
 	// Set font
-	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16) = 224;
+	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16) = (gConfigInterface.console_small_font ? 0 : 224);
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_FLAGS, uint16) = 0;
 
 	// Background
-	gfx_fill_rect(dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, 0);
+	gfx_fill_rect(dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, 10);
 
 	int x = _consoleLeft + 4;
 	int y = _consoleTop + 4;
 	
 	// Draw previous lines
 	char lineBuffer[1 + 256];
-	char *ch = _consoleViewBufferStart;
+	ch = _consoleViewBufferStart;
+	int currentLine = 0;
+	int drawLines = 0;
 	while (*ch != 0) {
 		// Find line break or null terminator
 		char *nextLine = ch;
@@ -134,6 +158,23 @@ void console_draw(rct_drawpixelinfo *dpi)
 			nextLine++;
 		}
 
+		currentLine++;
+		if (currentLine < (lines - maxLines + 4) - _consoleScrollPos) {
+			if (*nextLine == '\n') {
+				ch = nextLine + 1;
+				x = _consoleLeft + 4;
+				//y += 10;
+			}
+			else {
+				break;
+			}
+			continue;
+		}
+
+		if (drawLines >= maxLines)
+			break;
+		drawLines++;
+
 		int lineLength = min(sizeof(lineBuffer) - 1, nextLine - ch);
 		strncpy(lineBuffer + 1, ch, lineLength);
 		lineBuffer[0] = FORMAT_GREEN;
@@ -151,9 +192,12 @@ void console_draw(rct_drawpixelinfo *dpi)
 			break;
 		}
 	}
-
+	x = _consoleLeft + 4;
+	y = _consoleBottom - 15;
 	// Draw current line
-	gfx_draw_string(dpi, _consoleCurrentLine, 255, x, y);
+	strcpy(lineBuffer + 1, _consoleCurrentLine);
+	lineBuffer[0] = FORMAT_GREEN;
+	gfx_draw_string(dpi, lineBuffer, 255, x, y);
 
 	// Draw caret
 	if (_consoleCaretTicks < 15) {
@@ -164,8 +208,11 @@ void console_draw(rct_drawpixelinfo *dpi)
 
 		gfx_fill_rect(dpi, caretX, caretY, caretX + 6, caretY + 1, FORMAT_GREEN);
 	}
-	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom + 1, _consoleRight, _consoleBottom + 1, 14);
-	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom + 2, _consoleRight, _consoleBottom + 2, 11);
+	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom - 21, _consoleRight, _consoleBottom - 21, 14);
+	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom - 20, _consoleRight, _consoleBottom - 20, 11);
+
+	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom - 1, _consoleRight, _consoleBottom - 1, 14);
+	gfx_fill_rect(dpi, _consoleLeft, _consoleBottom - 0, _consoleRight, _consoleBottom - 0, 12);
 }
 
 void console_input(int c)
@@ -213,7 +260,7 @@ static void console_invalidate()
 
 static void console_write_prompt()
 {
-	console_write("OpenRCT2 > ");
+	console_write("> ");
 }
 
 void console_write(const char *src)
@@ -236,6 +283,20 @@ void console_writeline(const char *src)
 	console_write("\n");
 }
 
+void console_writeline_error(const char *src)
+{
+	strcpy(_consoleErrorBuffer + 1, src);
+	_consoleErrorBuffer[0] = FORMAT_RED;
+	console_writeline(_consoleErrorBuffer);
+}
+
+void console_writeline_warning(const char *src)
+{
+	strcpy(_consoleErrorBuffer + 1, src);
+	_consoleErrorBuffer[0] = FORMAT_YELLOW;
+	console_writeline(_consoleErrorBuffer);
+}
+
 void console_printf(const char *format, ...)
 {
 	va_list list;
@@ -245,10 +306,24 @@ void console_printf(const char *format, ...)
 	console_writeline(_consolePrintfBuffer);
 }
 
+int console_parse_int(const char *src, bool *valid) {
+	char *end;
+	int value;
+	value = strtol(src, &end, 10); *valid &= (*end == '\0');
+	return value;
+}
+
+double console_parse_double(const char *src, bool *valid) {
+	char *end;
+	double value;
+	value = strtod(src, &end); *valid &= (*end == '\0');
+	return value;
+}
+
 static void console_update_scroll()
 {
-	int lines = 0;
-	int maxLines = ((_consoleBottom - _consoleTop) / 10) - 1;
+	/*int lines = 0;
+	int maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1;
 	char *ch = strchr(_consoleBuffer, 0);
 	while (ch > _consoleBuffer && lines < maxLines) {
 		ch--;
@@ -258,11 +333,31 @@ static void console_update_scroll()
 
 	if (*ch == '\n')
 		ch++;
-	_consoleViewBufferStart = ch;
+	_consoleViewBufferStart = ch;*/
+}
+
+void console_scroll(int delta)
+{
+	int speed = 3;
+	int lines = 0;
+	int maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1;
+	char *ch = strchr(_consoleBuffer, 0);
+	while (ch > _consoleBuffer) {
+		ch--;
+		if (*ch == '\n')
+			lines++;
+	}
+	if (delta > 0 && _consoleScrollPos + 1 < (lines - maxLines + 4)) {
+		_consoleScrollPos = min(_consoleScrollPos + speed, (lines - maxLines + 4));
+	}
+	else if (delta < 0 && _consoleScrollPos > 0) {
+		_consoleScrollPos = max(_consoleScrollPos - speed, 0);
+	}
 }
 
 void console_clear()
 {
+	_consoleScrollPos = 0;
 	_consoleBuffer[0] = 0;
 	_consoleBufferPointer = _consoleBuffer;
 }
@@ -309,9 +404,213 @@ static int cc_echo(const char **argv, int argc)
 	return 0;
 }
 
-static int cc_object_count(const char **argv, int argc)
+static int cc_get(const char **argv, int argc)
 {
-	console_printf("%d total rides\n%d total large scenery", object_entry_group_counts[0], object_entry_group_counts[1]);
+	if (argc > 0) {
+		if (strcmp(argv[0], "park_rating") == 0) {
+			console_printf("park_rating %d", RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_RATING, sint16));
+		}
+		else if (strcmp(argv[0], "money") == 0) {
+			console_printf("money %d.%d0", DECRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32)) / 10, DECRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32)) % 10);
+		}
+		else if (strcmp(argv[0], "current_loan") == 0) {
+			console_printf("current_loan %d", RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) / 10);
+		}
+		else if (strcmp(argv[0], "max_loan") == 0) {
+			console_printf("max_loan %d", RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) / 10);
+		}
+		else if (strcmp(argv[0], "guest_initial_cash") == 0) {
+			console_printf("guest_initial_cash %d.%d0", RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) / 10, RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) % 10);
+		}
+		else if (strcmp(argv[0], "guest_initial_happiness") == 0) {
+			uint32 current_happiness = RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HAPPINESS, uint8);
+			for (int i = 15; i <= 99; i++) {
+				if (i == 99) {
+					console_printf("guest_initial_happiness %d%%  (%d)", 15, RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HAPPINESS, uint8));
+				}
+				else if (current_happiness == calculate_guest_initial_happiness(i)) {
+					console_printf("guest_initial_happiness %d%%  (%d)", i, RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HAPPINESS, uint8));
+					break;
+				}
+			}
+		}
+		else if (strcmp(argv[0], "guest_initial_hunger") == 0) {
+			console_printf("guest_initial_hunger %d%%  (%d)", ((255 - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HUNGER, uint8)) * 100) / 255, RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HUNGER, uint8));
+		}
+		else if (strcmp(argv[0], "guest_initial_thirst") == 0) {
+			console_printf("guest_initial_thirst %d%%  (%d)", ((255 - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_THIRST, uint8)) * 100) / 255, RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_THIRST, uint8));
+		}
+		else if (strcmp(argv[0], "guest_prefer_less_intense_rides") == 0) {
+			console_printf("guest_prefer_less_intense_rides %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) != 0);
+		}
+		else if (strcmp(argv[0], "guest_prefer_more_intense_rides") == 0) {
+			console_printf("guest_prefer_more_intense_rides %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) != 0);
+		}
+		else if (strcmp(argv[0], "forbid_marketing_campagns") == 0) {
+			console_printf("forbid_marketing_campagns %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) != 0);
+		}
+		else if (strcmp(argv[0], "forbid_landscape_changes") == 0) {
+			console_printf("forbid_landscape_changes %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) != 0);
+		}
+		else if (strcmp(argv[0], "forbid_tree_removal") == 0) {
+			console_printf("forbid_tree_removal %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_FORBID_TREE_REMOVAL) != 0);
+		}
+		else if (strcmp(argv[0], "forbid_high_construction") == 0) {
+			console_printf("forbid_high_construction %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) != 0);
+		}
+		else if (strcmp(argv[0], "pay_for_rides") == 0) {
+			console_printf("pay_for_rides %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_FREE_ENTRY) != 0);
+		}
+		else if (strcmp(argv[0], "no_money") == 0) {
+			console_printf("no_money %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY) != 0);
+		}
+		else if (strcmp(argv[0], "difficult_park_rating") == 0) {
+			console_printf("difficult_park_rating %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_DIFFICULT_PARK_RATING) != 0);
+		}
+		else if (strcmp(argv[0], "difficult_guest_generation") == 0) {
+			console_printf("difficult_guest_generation %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0);
+		}
+		else if (strcmp(argv[0], "park_open") == 0) {
+			console_printf("park_open %d", (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_OPEN) != 0);
+		}
+		else if (strcmp(argv[0], "land_rights_cost") == 0) {
+			console_printf("land_rights_cost %d.%d0", RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) / 10, RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) % 10);
+		}
+		else if (strcmp(argv[0], "construction_rights_cost") == 0) {
+			console_printf("construction_rights_cost %d.%d0", RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money32) / 10, RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money32) % 10);
+		}
+		else if (strcmp(argv[0], "climate") == 0) {
+			const char* climate_names[] = { "cool_and_wet", "warm", "hot_and_dry", "cold" };
+			console_printf("climate %s  (%d)", climate_names[RCT2_GLOBAL(RCT2_ADDRESS_CLIMATE, sint8)], RCT2_GLOBAL(RCT2_ADDRESS_CLIMATE, sint8));
+		}
+		else if (strcmp(argv[0], "game_speed") == 0) {
+			console_printf("game_speed %d", gGameSpeed);
+		}
+		else if (strcmp(argv[0], "console_small_font") == 0) {
+			console_printf("console_small_font %d", gConfigInterface.console_small_font);
+		}
+		else {
+			console_writeline_warning("Invalid variable.");
+		}
+	}
+	return 0;
+}
+static int cc_set(const char **argv, int argc)
+{
+	if (argc > 1) {
+		bool int_valid = true, double_valid = true;
+
+		int int_val = console_parse_int(argv[1], &int_valid);
+		double double_val = console_parse_double(argv[1], &double_valid);
+
+		if (strcmp(argv[0], "money") == 0 && double_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32) = ENCRYPT_MONEY(MONEY((int)double_val, ((int)(double_val * 100)) % 100));
+			console_execute_silent("get money");
+		}
+		else if (strcmp(argv[0], "current_loan") == 0 && int_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = clamp(MONEY(int_val - (int_val % 1000), 0), MONEY(0, 0), RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32));
+			console_execute_silent("get current_loan");
+		}
+		else if (strcmp(argv[0], "max_loan") == 0 && int_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) = clamp(MONEY(int_val - (int_val % 1000), 0), MONEY(0, 0), MONEY(5000000, 0));
+			console_execute_silent("get max_loan");
+		}
+		else if (strcmp(argv[0], "guest_initial_cash") == 0 && double_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) = clamp(MONEY((int)double_val, ((int)(double_val * 100)) % 100), MONEY(0, 0), MONEY(15000, 0));
+			console_execute_silent("get guest_initial_cash");
+		}
+		else if (strcmp(argv[0], "guest_initial_happiness") == 0 && int_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HAPPINESS, uint8) = calculate_guest_initial_happiness((uint8)int_val);
+			console_execute_silent("get guest_initial_happiness");
+		}
+		else if (strcmp(argv[0], "guest_initial_hunger") == 0 && int_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HUNGER, uint8) = (clamp(int_val, 1, 84) * 255 / 100 - 255) * -1;
+			console_execute_silent("get guest_initial_hunger");
+		}
+		else if (strcmp(argv[0], "guest_initial_thirst") == 0 && int_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_THIRST, uint8) = (clamp(int_val, 1, 84) * 255 / 100 - 255) * -1;
+			console_execute_silent("get guest_initial_thirst");
+		}
+		else if (strcmp(argv[0], "guest_prefer_less_intense_rides") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_PREF_LESS_INTENSE_RIDES, int_val);
+			console_execute_silent("get guest_prefer_less_intense_rides");
+		}
+		else if (strcmp(argv[0], "guest_prefer_more_intense_rides") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_PREF_MORE_INTENSE_RIDES, int_val);
+			console_execute_silent("get guest_prefer_more_intense_rides");
+		}
+		else if (strcmp(argv[0], "forbid_marketing_campagns") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_FORBID_MARKETING_CAMPAIGN, int_val);
+			console_execute_silent("get forbid_marketing_campagns");
+		}
+		else if (strcmp(argv[0], "forbid_landscape_changes") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_FORBID_LANDSCAPE_CHANGES, int_val);
+			console_execute_silent("get forbid_landscape_changes");
+		}
+		else if (strcmp(argv[0], "forbid_tree_removal") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_FORBID_TREE_REMOVAL, int_val);
+			console_execute_silent("get forbid_tree_removal");
+		}
+		else if (strcmp(argv[0], "forbid_high_construction") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_FORBID_HIGH_CONSTRUCTION, int_val);
+			console_execute_silent("get forbid_high_construction");
+		}
+		else if (strcmp(argv[0], "pay_for_rides") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_PARK_FREE_ENTRY, int_val);
+			console_execute_silent("get pay_for_rides");
+		}
+		else if (strcmp(argv[0], "no_money") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_NO_MONEY, int_val);
+			console_execute_silent("get no_money");
+		}
+		else if (strcmp(argv[0], "difficult_park_rating") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_DIFFICULT_PARK_RATING, int_val);
+			console_execute_silent("get difficult_park_rating");
+		}
+		else if (strcmp(argv[0], "difficult_guest_generation") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_DIFFICULT_GUEST_GENERATION, int_val);
+			console_execute_silent("get difficult_guest_generation");
+		}
+		else if (strcmp(argv[0], "park_open") == 0 && int_valid) {
+			SET_FLAG(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), PARK_FLAGS_PARK_OPEN, int_val);
+			console_execute_silent("get park_open");
+		}
+		else if (strcmp(argv[0], "land_rights_cost") == 0 && double_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) = clamp(MONEY((int)double_val, ((int)(double_val * 100)) % 100), MONEY(0, 0), MONEY(15000, 0));
+			console_execute_silent("get land_rights_cost");
+		}
+		else if (strcmp(argv[0], "construction_rights_cost") == 0 && double_valid) {
+			RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16) = clamp(MONEY((int)double_val, ((int)(double_val * 100)) % 100), MONEY(0, 0), MONEY(15000, 0));
+			console_execute_silent("get construction_rights_cost");
+		}
+		else if (strcmp(argv[0], "climate") == 0) {
+			if (int_valid) {
+				RCT2_GLOBAL(RCT2_ADDRESS_CLIMATE, sint8) = clamp(int_val, 0, 3);
+			}
+			else {
+				char* climate_names[] = { "cool_and_wet", "warm", "hot_and_dry", "cold" };
+				for (int i = 0; i < 4; i++) {
+					if (strcmp(argv[1], climate_names[i]) == 0) {
+						RCT2_GLOBAL(RCT2_ADDRESS_CLIMATE, sint8) = i;
+						break;
+					}
+				}
+			}
+			console_execute_silent("get climate");
+		}
+		else if (strcmp(argv[0], "game_speed") == 0 && int_valid) {
+			gGameSpeed = clamp(int_val, 1, 8);
+			console_execute_silent("get game_speed");
+		}
+		else if (strcmp(argv[0], "console_small_font") == 0 && int_valid) {
+			gConfigInterface.console_small_font = (int_val != 0);
+			config_save_default();
+			console_execute_silent("get console_small_font");
+		}
+		else {
+			console_writeline_error("Invalid variable or value.");
+		}
+	}
 	return 0;
 }
 
@@ -323,13 +622,49 @@ typedef struct {
 	char *help;
 } console_command;
 
+char* console_variable_table[] = {
+	"park_rating",
+	"money",
+	"current_loan",
+	"max_loan",
+	"guest_initial_cash",
+	"guest_initial_happiness",
+	"guest_initial_hunger",
+	"guest_initial_thirst",
+	"guest_prefer_less_intense_rides",
+	"guest_prefer_more_intense_rides",
+	"forbid_marketing_campagn",
+	"forbid_landscape_changes",
+	"forbid_tree_removal",
+	"forbid_high_construction",
+	"pay_for_rides",
+	"no_money",
+	"difficult_park_rating",
+	"difficult_guest_generation",
+	"land_rights_cost",
+	"construction_rights_cost",
+	"park_open",
+	"climate",
+	"game_speed",
+	"console_small_font"
+};
+
 console_command console_command_table[] = {
 	{ "clear", cc_clear, "Clears the console." },
 	{ "echo", cc_echo, "Echos the text to the console.\necho text" },
 	{ "help", cc_help, "Lists commands or info about a command.\nhelp [command]" },
-	{ "object_count", cc_object_count, "Lists the total objecst in the scenario.\nobject_count" }
+	{ "get", cc_get, "Gets the value of the specified variable.\nget variable" },
+	{ "set", cc_set, "Sets the variable to the specified value.\nset variable value" },
+	{ "variables", cc_variables, "Lists all the variables that can be used with get and sometimes set." }
 };
 
+static int cc_variables(const char **argv, int argc)
+{
+	for (int i = 0; i < countof(console_variable_table); i++)
+		console_writeline(console_variable_table[i]);
+	return 0;
+}
+
 static int cc_help(const char **argv, int argc)
 {
 	if (argc > 0) {
@@ -352,8 +687,13 @@ static void console_write_all_commands()
 
 void console_execute(const char *src)
 {
-	console_writeline(_consoleCurrentLine);
+	console_writeline(src);
 
+	console_execute_silent(src);
+}
+
+void console_execute_silent(const char *src)
+{
 	int argc = 0;
 	int argvCapacity = 8;
 	char **argv = malloc(argvCapacity * sizeof(char*));
@@ -367,7 +707,8 @@ void console_execute(const char *src)
 		if (*start == '"') {
 			inQuotes = true;
 			start++;
-		} else {
+		}
+		else {
 			inQuotes = false;
 		}
 
@@ -380,7 +721,7 @@ void console_execute(const char *src)
 			end++;
 		}
 		int length = end - start;
-		
+
 		if (length > 0) {
 			char *arg = malloc(length + 1);
 			memcpy(arg, start, length);

src/interface/console.h

@@ -15,10 +15,14 @@ void console_draw(rct_drawpixelinfo *dpi);
 void console_input(int c);
 void console_write(const char *src);
 void console_writeline(const char *src);
+void console_writeline_error(const char *src);
+void console_writeline_warning(const char *src);
 void console_printf(const char *format, ...);
 void console_execute(const char *src);
+void console_execute_silent(const char *src);
 void console_clear();
 void console_clear_line();
 void console_refresh_carot();
+void console_scroll(int delta);
 
 #endif

src/platform/shared.c

@@ -318,6 +318,10 @@ void platform_process_messages()
 			gCursorState.y = e.motion.y;
 			break;
 		case SDL_MOUSEWHEEL:
+			if (gConsoleOpen) {
+				console_scroll(e.wheel.y);
+				break;
+			}
 			gCursorState.wheel += e.wheel.y * 128;
 			break;
 		case SDL_MOUSEBUTTONDOWN:
@@ -458,7 +462,7 @@ void platform_process_messages()
 				// Convert the utf-8 code into rct ascii
 				char new_char;
 				if (e.text.text[0] == '`' && gConsoleOpen)
-					continue;
+					break;
 				if (!(e.text.text[0] & 0x80))
 					new_char = *e.text.text;
 				else if (!(e.text.text[0] & 0x20))
@@ -471,7 +475,7 @@ void platform_process_messages()
 					gTextInputLength++;
 				} else {
 					gTextInput[gTextInputLength++] = new_char;
-					gTextInput[gTextInputLength++] = 0;
+					gTextInput[gTextInputLength] = 0;
 				}
 
 				gTextInputCursorPosition++;