mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 18:25:16 +01:00
Code Issues Releases Wiki Activity

detect desyncs

Browse Source
This commit is contained in:
zsilencer
2015-07-30 08:34:17 -06:00
parent 111a2e8198
commit a4267990b8
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/network/network.cpp
View File

@@ -470,6 +470,17 @@ void Network::SendPacketToClients(NetworkPacket& packet)
}
}
bool Network::CheckSRAND(uint32 tick, uint32 srand0)
{
if (tick == server_srand0_tick) {
server_srand0_tick = 0;
if (srand0 != server_srand0) {
return false;
}
}
return true;
}
void Network::Client_Send_AUTH(const char* gameversion, const char* name, const char* password)
{
std::unique_ptr<NetworkPacket> packet = std::move(NetworkPacket::Allocate());
@@ -532,7 +543,7 @@ void Network::Server_Send_GAMECMD(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx
void Network::Server_Send_TICK()
{
std::unique_ptr<NetworkPacket> packet = std::move(NetworkPacket::Allocate());
*packet << (uint32)NETWORK_COMMAND_TICK << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32);
*packet << (uint32)NETWORK_COMMAND_TICK << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32);
SendPacketToClients(*packet);
}
@@ -769,6 +780,7 @@ int Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pac
pause_toggle();
game_command_queue.clear();
server_tick = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32);
server_srand0_tick = 0;
window_network_status_open("Loaded new map from network");
}
SDL_RWclose(rw);
@@ -826,7 +838,12 @@ int Network::Server_Handle_GAMECMD(NetworkConnection& connection, NetworkPacket&
int Network::Client_Handle_TICK(NetworkConnection& connection, NetworkPacket& packet)
{
packet >> server_tick;
uint32 srand0;
packet >> server_tick >> srand0;
if (server_srand0_tick == 0) {
server_srand0 = srand0;
server_srand0_tick = server_tick;
}
return 1;
}
@@ -905,6 +922,10 @@ int network_begin_server(int port)
void network_update()
{
gNetwork.Update();
if (!gNetwork.CheckSRAND(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32), RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32))) {
window_network_status_open("Network desync detected");
gNetwork.Close();
}
}
int network_get_mode()

3
src/network/network.h
View File

@@ -135,6 +135,7 @@ public:
NetworkPlayer* GetPlayerByID(int id);
const char* FormatChat(NetworkPlayer* fromplayer, const char* text);
void SendPacketToClients(NetworkPacket& packet);
bool CheckSRAND(uint32 tick, uint32 srand0);
void Client_Send_AUTH(const char* gameversion, const char* name, const char* password);
void Server_Send_MAP();
@@ -179,6 +180,8 @@ private:
uint32 last_tick_sent_time;
uint32 last_ping_sent_time;
uint32 server_tick;
uint32 server_srand0;
uint32 server_srand0_tick;
uint8 player_id;
std::list<std::unique_ptr<NetworkConnection>> client_connection_list;
std::multiset<GameCommand> game_command_queue;

4
src/windows/network_status.c
View File

@@ -79,6 +79,8 @@ void window_network_status_open(const char* text)
{
rct_window* window;
strncpy(window_network_status_text, text, sizeof(window_network_status_text));
// Check if window is already open
window = window_bring_to_front_by_class(WC_NETWORK_STATUS);
if (window != NULL)
@@ -86,8 +88,6 @@ void window_network_status_open(const char* text)
window = window_create_centred(320, 90, &window_network_status_events, WC_NETWORK_STATUS, WF_10 | WF_TRANSPARENT);
strncpy(window_network_status_text, text, sizeof(window_network_status_text));
window->widgets = window_network_status_widgets;
window->enabled_widgets = 1 << WIDX_CLOSE;
window_init_scroll_widgets(window);