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 default master server url and refactor

Browse Source
This commit is contained in:
IntelOrca
2015-11-07 23:56:16 +00:00
parent 74fe482a62
commit 9bad4183a7
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@@ -243,8 +243,8 @@ config_property_definition _networkDefinitions[] = {
{ offsetof(network_configuration, advertise), "advertise", CONFIG_VALUE_TYPE_BOOLEAN, false, NULL }, { offsetof(network_configuration, advertise), "advertise", CONFIG_VALUE_TYPE_BOOLEAN, false, NULL },
{ offsetof(network_configuration, maxplayers), "maxplayers", CONFIG_VALUE_TYPE_UINT8, 16, NULL }, { offsetof(network_configuration, maxplayers), "maxplayers", CONFIG_VALUE_TYPE_UINT8, 16, NULL },
{ offsetof(network_configuration, server_name), "server_name", CONFIG_VALUE_TYPE_STRING, {.value_string = "Server" }, NULL }, { offsetof(network_configuration, server_name), "server_name", CONFIG_VALUE_TYPE_STRING, {.value_string = "Server" }, NULL },
{ offsetof(network_configuration, server_description), "server_description", CONFIG_VALUE_TYPE_STRING, {.value_string = "" }, NULL }, { offsetof(network_configuration, server_description), "server_description", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL },
{ offsetof(network_configuration, master_url), "master_url", CONFIG_VALUE_TYPE_STRING, {.value_string = OPENRCT2_MASTER_URL }, NULL } { offsetof(network_configuration, master_server_url), "master_server_url", CONFIG_VALUE_TYPE_STRING, {.value_string = NULL }, NULL }
}; };
config_section_definition _sectionDefinitions[] = { config_section_definition _sectionDefinitions[] = {

2
src/config.h
View File

@@ -218,7 +218,7 @@ typedef struct {
uint8 maxplayers; uint8 maxplayers;
utf8string server_name; utf8string server_name;
utf8string server_description; utf8string server_description;
utf8string master_url; utf8string master_server_url;
} network_configuration; } network_configuration;
typedef struct theme_window { typedef struct theme_window {

10
src/network/network.cpp
View File

@@ -791,10 +791,16 @@ void Network::ShutdownClient()
void Network::Advertise() void Network::Advertise()
{ {
if (gConfigNetwork.advertise && strlen(gConfigNetwork.master_url) > 0) { if (gConfigNetwork.advertise) {
last_advertise_time = SDL_GetTicks(); last_advertise_time = SDL_GetTicks();
#ifndef DISABLE_HTTP #ifndef DISABLE_HTTP
std::string url = gConfigNetwork.master_url + std::string("?port=") + std::to_string(listening_port); const char *masterServerUrl = OPENRCT2_MASTER_SERVER_URL;
if (!str_is_null_or_empty(gConfigNetwork.master_server_url)) {
masterServerUrl = gConfigNetwork.master_server_url;
}
std::string url = masterServerUrl + std::string("?port=") + std::to_string(listening_port);
http_request_json_async(url.c_str(), [](http_json_response *response)->void { }); http_request_json_async(url.c_str(), [](http_json_response *response)->void { });
#endif #endif
} }

2
src/rct2.h
View File

@@ -105,7 +105,7 @@ typedef utf16* utf16string;
#define OPENRCT2_BRANCH "develop" #define OPENRCT2_BRANCH "develop"
#define OPENRCT2_COMMIT_SHA1 "" #define OPENRCT2_COMMIT_SHA1 ""
#define OPENRCT2_COMMIT_SHA1_SHORT "" #define OPENRCT2_COMMIT_SHA1_SHORT ""
#define OPENRCT2_MASTER_URL "" #define OPENRCT2_MASTER_SERVER_URL "https://servers.openrct2.website"
// Represent fixed point numbers. dp = decimal point // Represent fixed point numbers. dp = decimal point
typedef uint8 fixed8_1dp; typedef uint8 fixed8_1dp;

9
src/windows/server_list.c
View File

@@ -638,7 +638,11 @@ static void join_server(char *address)
static void fetch_servers() static void fetch_servers()
{ {
#ifndef DISABLE_HTTP #ifndef DISABLE_HTTP
if(strlen(gConfigNetwork.master_url) > 0){ const char *masterServerUrl = OPENRCT2_MASTER_SERVER_URL;
if (!str_is_null_or_empty(gConfigNetwork.master_server_url)) {
masterServerUrl = gConfigNetwork.master_server_url;
}
SDL_LockMutex(_mutex); SDL_LockMutex(_mutex);
for (int i = 0; i < _numSavedServers; i++) { for (int i = 0; i < _numSavedServers; i++) {
if (!_savedServers[i].favorite) { if (!_savedServers[i].favorite) {
@@ -647,8 +651,7 @@ static void fetch_servers()
} }
} }
SDL_UnlockMutex(_mutex); SDL_UnlockMutex(_mutex);
http_request_json_async(gConfigNetwork.master_url, fetch_servers_callback); http_request_json_async(masterServerUrl, fetch_servers_callback);
}
#endif #endif
} }