mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

fix network merge issues, fix #1785

Browse Source
This commit is contained in:
IntelOrca
2015-08-14 22:06:15 +01:00
parent 90fcc6f18e
commit 3f31221973
9 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/language/english_uk.txt
View File

@@ -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:

6
projects/openrct2.vcxproj
View File

@@ -347,7 +347,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<StructMemberAlignment>1Byte</StructMemberAlignment>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)fake\%(RelativeDir)</ObjectFileName>
@@ -378,7 +378,7 @@ xcopy /YS "$(SolutionDir)\..\Data" "$(TargetDir)\Data"</Command>
<OmitFramePointers>
</OmitFramePointers>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)fake\%(RelativeDir)</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -418,7 +418,7 @@ xcopy /YS "$(SolutionDir)\..\Data" "$(TargetDir)\Data"</Command>
<OmitFramePointers>
</OmitFramePointers>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CURL_STATICLIB;ENABLE_TESTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;ENABLE_TESTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)fake\%(RelativeDir)</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>

22
projects/openrct2.vcxproj.filters
View File

@@ -498,13 +498,6 @@
<ClCompile Include="..\src\localisation\convert.c">
<Filter>Source\Localisation</Filter>
</ClCompile>
<ClCompile Include="..\src\network\network.c">
<ClCompile Include="..\src\network\network.cpp">
<Filter>Source\Network</Filter>
</ClCompile>
<ClCompile Include="..\src\windows\network.c">
<Filter>Source\Windows</Filter>
</ClCompile>
<ClCompile Include="..\src\drawing\scrolling_text.c">
<Filter>Source\Drawing</Filter>
</ClCompile>
@@ -514,6 +507,18 @@
<ClCompile Include="..\src\localisation\utf8.c">
<Filter>Source\Localisation</Filter>
</ClCompile>
<ClCompile Include="..\src\network\network.cpp">
<Filter>Source\Network</Filter>
</ClCompile>
<ClCompile Include="..\src\windows\network_status.c">
<Filter>Source\Windows</Filter>
</ClCompile>
<ClCompile Include="..\src\windows\player_list.c">
<Filter>Source\Windows</Filter>
</ClCompile>
<ClCompile Include="..\src\interface\chat.c">
<Filter>Source\Interface</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\management\award.h">
@@ -750,5 +755,8 @@
<ClInclude Include="..\src\network\network.h">
<Filter>Source\Network</Filter>
</ClInclude>
<ClInclude Include="..\src\interface\chat.h">
<Filter>Source\Interface</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
src/config.c
View File

@@ -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

2
src/config.h
View File

@@ -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_OPEN_CHAT_WINDOW,
SHORTCUT_COUNT
};

8
src/interface/keyboard_shortcut.c
View File

@@ -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

8
src/localisation/string_ids.h
View File

@@ -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

3
src/windows/shortcut_keys.c
View File

@@ -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,
};
/**

8
src/world/map.c
View File

@@ -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)