diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt
index 6c49fdf65b..144bf8a857 100644
--- a/data/language/english_uk.txt
+++ b/data/language/english_uk.txt
@@ -3831,9 +3831,8 @@ STR_5489 :{SMALLFONT}{BLACK}Show only tracked guests
STR_5490 :Disable audio on focus loss
STR_5491 :Inventions list
STR_5492 :Scenario options
-
-STR_6000 :Send Message
-STR_6001 :Type the message you would like to send.
-STR_6002 :Player List
-STR_6003 :Player:
-STR_6004 :Ping:
+STR_5493 :Send Message
+STR_5494 :Type the message you would like to send.
+STR_5495 :Player List
+STR_5496 :Player:
+STR_5497 :Ping:
diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj
index a6886387b4..84ea401ec4 100644
--- a/projects/openrct2.vcxproj
+++ b/projects/openrct2.vcxproj
@@ -347,7 +347,7 @@
Disabled
true
1Byte
- _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_CURL_STATICLIB;%(PreprocessorDefinitions)
+ _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;%(PreprocessorDefinitions)
MultiThreaded
true
$(IntDir)fake\%(RelativeDir)
@@ -378,7 +378,7 @@ xcopy /YS "$(SolutionDir)\..\Data" "$(TargetDir)\Data"
false
- _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CURL_STATICLIB;%(PreprocessorDefinitions)
+ _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;%(PreprocessorDefinitions)
$(IntDir)fake\%(RelativeDir)
true
Speed
@@ -418,7 +418,7 @@ xcopy /YS "$(SolutionDir)\..\Data" "$(TargetDir)\Data"
false
- _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CURL_STATICLIB;ENABLE_TESTS;%(PreprocessorDefinitions)
+ _CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;ENABLE_TESTS;%(PreprocessorDefinitions)
$(IntDir)fake\%(RelativeDir)
true
diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters
index a1068acb6d..49d011038e 100644
--- a/projects/openrct2.vcxproj.filters
+++ b/projects/openrct2.vcxproj.filters
@@ -498,13 +498,6 @@
Source\Localisation
-
-
- Source\Network
-
-
- Source\Windows
-
Source\Drawing
@@ -514,6 +507,18 @@
Source\Localisation
+
+ Source\Network
+
+
+ Source\Windows
+
+
+ Source\Windows
+
+
+ Source\Interface
+
@@ -750,5 +755,8 @@
Source\Network
+
+ Source\Interface
+
\ No newline at end of file
diff --git a/src/config.c b/src/config.c
index 32246efe8f..ea8dfefc7e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -986,11 +986,11 @@ static const uint16 _defaultShortcutKeys[SHORTCUT_COUNT] = {
SDL_SCANCODE_EQUALS, // SHORTCUT_INCREASE_GAME_SPEED,
CTRL | ALT | SDL_SCANCODE_C, // SHORTCUT_OPEN_CHEAT_WINDOW,
SDL_SCANCODE_T, // SHORTCUT_REMOVE_TOP_BOTTOM_TOOLBAR_TOGGLE,
- SDL_SCANCODE_C, // SHORTCUT_OPEN_CHAT_WINDOW
SDL_SCANCODE_UP, // SHORTCUT_SCROLL_MAP_UP
SDL_SCANCODE_LEFT, // SHORTCUT_SCROLL_MAP_LEFT
SDL_SCANCODE_DOWN, // SHORTCUT_SCROLL_MAP_DOWN
SDL_SCANCODE_RIGHT, // SHORTCUT_SCROLL_MAP_RIGHT
+ SDL_SCANCODE_C, // SHORTCUT_OPEN_CHAT_WINDOW
};
#define SHORTCUT_FILE_VERSION 1
diff --git a/src/config.h b/src/config.h
index e8410ac7f2..46a23acb30 100644
--- a/src/config.h
+++ b/src/config.h
@@ -72,11 +72,11 @@ enum {
SHORTCUT_INCREASE_GAME_SPEED,
SHORTCUT_OPEN_CHEAT_WINDOW,
SHORTCUT_REMOVE_TOP_BOTTOM_TOOLBAR_TOGGLE,
- SHORTCUT_OPEN_CHAT_WINDOW,
SHORTCUT_SCROLL_MAP_UP,
SHORTCUT_SCROLL_MAP_LEFT,
SHORTCUT_SCROLL_MAP_DOWN,
- SHORTCUT_SCROLL_MAP_RIGHT,
+ SHORTCUT_SCROLL_MAP_RIGHT,
+ SHORTCUT_OPEN_CHAT_WINDOW,
SHORTCUT_COUNT
};
diff --git a/src/interface/keyboard_shortcut.c b/src/interface/keyboard_shortcut.c
index cd5e50903b..f45998020c 100644
--- a/src/interface/keyboard_shortcut.c
+++ b/src/interface/keyboard_shortcut.c
@@ -540,11 +540,11 @@ static const shortcut_action shortcut_table[SHORTCUT_COUNT] = {
shortcut_increase_game_speed,
shortcut_open_cheat_window,
shortcut_remove_top_bottom_toolbar_toggle,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
shortcut_open_chat_window,
- NULL,
- NULL,
- NULL,
- NULL,
};
#pragma endregion
diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h
index 1ec59b969b..8fbbc0d93e 100644
--- a/src/localisation/string_ids.h
+++ b/src/localisation/string_ids.h
@@ -2030,9 +2030,11 @@ enum {
STR_DEBUG_DROPDOWN_INVENTIONS_LIST = 5491,
STR_DEBUG_DROPDOWN_SCENARIO_OPTIONS = 5492,
- STR_PLAYER_LIST = 6002,
- STR_PLAYER = 6003,
- STR_PING = 6004,
+ STR_SEND_MESSAGE = 5493,
+ STR_TYPE_THE_MESSAGE_YOU_WOULD_LIKE_TO_SEND = 5494,
+ STR_PLAYER_LIST = 5495,
+ STR_PLAYER = 5496,
+ STR_PING = 5497,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768
diff --git a/src/windows/shortcut_keys.c b/src/windows/shortcut_keys.c
index 956c9410e3..0499330cea 100644
--- a/src/windows/shortcut_keys.c
+++ b/src/windows/shortcut_keys.c
@@ -129,7 +129,8 @@ const rct_string_id ShortcutStringIds[] = {
STR_SHORTCUT_SCROLL_MAP_UP,
STR_SHORTCUT_SCROLL_MAP_LEFT,
STR_SHORTCUT_SCROLL_MAP_DOWN,
- STR_SHORTCUT_SCROLL_MAP_RIGHT
+ STR_SHORTCUT_SCROLL_MAP_RIGHT,
+ STR_SEND_MESSAGE,
};
/**
diff --git a/src/world/map.c b/src/world/map.c
index d57bf00797..9a6d56043d 100644
--- a/src/world/map.c
+++ b/src/world/map.c
@@ -1389,7 +1389,7 @@ restart_from_beginning:
int ebx = flags;
int ecx = y * 32;
int edx = mapElement->base_height;
- int edi, ebp;
+ int edi = 0, ebp = 0;
cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_PATH, edi, ebp);
if (cost == MONEY32_UNDEFINED)
@@ -1405,7 +1405,7 @@ restart_from_beginning:
int ebx = (mapElement->type << 8) | flags;
int ecx = y * 32;
int edx = (mapElement->properties.scenery.type << 8) | (mapElement->base_height);
- int edi, ebp;
+ int edi = 0, ebp = 0;
cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_SCENERY, edi, ebp);
if (cost == MONEY32_UNDEFINED)
@@ -1422,7 +1422,7 @@ restart_from_beginning:
int ebx = flags;
int ecx = y * 32;
int edx = (mapElement->base_height << 8) | (mapElement->type & MAP_ELEMENT_DIRECTION_MASK);
- int edi, ebp;
+ int edi = 0, ebp = 0;
cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_FENCE, edi, ebp);
if (cost == MONEY32_UNDEFINED)
@@ -1439,7 +1439,7 @@ restart_from_beginning:
int ebx = flags | ((mapElement->type & MAP_ELEMENT_DIRECTION_MASK) << 8);
int ecx = y * 32;
int edx = mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8);
- int edi, ebp;
+ int edi = 0, ebp = 0;
cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_LARGE_SCENERY, edi, ebp);
if (cost == MONEY32_UNDEFINED)