mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Add address parameter in network_begin_server

Browse Source
This commit is contained in:
Leurak
2017-05-04 12:14:28 +02:00
committed by Ted John
parent c002df1abf
commit 112f7b7a0d
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/network/network.cpp
View File

@@ -274,6 +274,9 @@ bool Network::BeginServer(uint16 port, const char* address)
_userManager.Load(); _userManager.Load();
if (strlen(address) == 0)
address = nullptr;
log_verbose("Begin listening for clients"); log_verbose("Begin listening for clients");
assert(listening_socket == nullptr); assert(listening_socket == nullptr);
@@ -2134,12 +2137,8 @@ sint32 network_begin_client(const char *host, sint32 port)
return gNetwork.BeginClient(host, port); return gNetwork.BeginClient(host, port);
} }
sint32 network_begin_server(sint32 port) sint32 network_begin_server(sint32 port, const char* address)
{ {
char *address = nullptr;
if (strlen(gConfigNetwork.listen_address) > 0)
address = gConfigNetwork.listen_address;
return gNetwork.BeginServer(port, address); return gNetwork.BeginServer(port, address);
} }
@@ -2674,7 +2673,7 @@ void network_send_gamecmd(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32
void network_send_map() {} void network_send_map() {}
void network_update() {} void network_update() {}
sint32 network_begin_client(const char *host, sint32 port) { return 1; } sint32 network_begin_client(const char *host, sint32 port) { return 1; }
sint32 network_begin_server(sint32 port) { return 1; } sint32 network_begin_server(sint32 port, const char * address) { return 1; }
sint32 network_get_num_players() { return 1; } sint32 network_get_num_players() { return 1; }
const char* network_get_player_name(uint32 index) { return "local (OpenRCT2 compiled without MP)"; } const char* network_get_player_name(uint32 index) { return "local (OpenRCT2 compiled without MP)"; }
uint32 network_get_player_flags(uint32 index) { return 0; } uint32 network_get_player_flags(uint32 index) { return 0; }

2
src/openrct2/network/network.h
View File

@@ -264,7 +264,7 @@ sint32 network_init();
void network_close(); void network_close();
void network_shutdown_client(); void network_shutdown_client();
sint32 network_begin_client(const char *host, sint32 port); sint32 network_begin_client(const char *host, sint32 port);
sint32 network_begin_server(sint32 port); sint32 network_begin_server(sint32 port, const char* address);
sint32 network_get_mode(); sint32 network_get_mode();
sint32 network_get_status(); sint32 network_get_status();

4
src/openrct2/windows/server_start.c
View File

@@ -166,7 +166,7 @@ static void window_server_start_scenarioselect_callback(const utf8 *path)
{ {
network_set_password(_password); network_set_password(_password);
if (scenario_load_and_play_from_path(path)) { if (scenario_load_and_play_from_path(path)) {
network_begin_server(gConfigNetwork.default_port); network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
} else { } else {
title_load(); title_load();
} }
@@ -175,7 +175,7 @@ static void window_server_start_scenarioselect_callback(const utf8 *path)
static void window_server_start_loadsave_callback(sint32 result, const utf8 * path) static void window_server_start_loadsave_callback(sint32 result, const utf8 * path)
{ {
if (result == MODAL_RESULT_OK && game_load_save_or_scenario(path)) { if (result == MODAL_RESULT_OK && game_load_save_or_scenario(path)) {
network_begin_server(gConfigNetwork.default_port); network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
} }
} }