From f7aa06bdeca64ab0028e4f6a0c69dc242b01d185 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sat, 7 Mar 2015 15:56:56 -0500 Subject: [PATCH] cleanup of multi related cfg options --- src/freespace2/freespace.cpp | 30 ----------------------------- src/network/multi.cpp | 36 +++++++++++++++++++++++++++++++++++ src/network/multi_options.cpp | 2 +- src/network/multi_update.cpp | 2 +- src/network/multiutil.cpp | 5 +++-- src/network/psnet2.cpp | 4 +++- 6 files changed, 44 insertions(+), 35 deletions(-) diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index 13bf61c..a1bb38b 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -2269,8 +2269,6 @@ DCF(gamma,"Sets Gamma factor") void game_init() { - const char *ptr; - Game_current_mission_filename[0] = 0; // seed the random number generator @@ -2378,34 +2376,6 @@ void game_init() display_title_screen(); } #endif - - // attempt to load up master tracker registry info (login and password) - Multi_tracker_id = -1; - - // pxo login and password - ptr = os_config_read_string(NOX("PXO"),NOX("Login"),NULL); - if(ptr == NULL){ - nprintf(("Network","Error reading in PXO login data\n")); - SDL_strlcpy(Multi_tracker_login, "", sizeof(Multi_tracker_login)); - } else { - SDL_strlcpy(Multi_tracker_login, ptr, sizeof(Multi_tracker_login)); - } - ptr = os_config_read_string(NOX("PXO"),NOX("Password"),NULL); - if(ptr == NULL){ - nprintf(("Network","Error reading PXO password\n")); - SDL_strlcpy(Multi_tracker_passwd, "", sizeof(Multi_tracker_passwd)); - } else { - SDL_strlcpy(Multi_tracker_passwd, ptr, sizeof(Multi_tracker_passwd)); - } - - // pxo squad name and password - ptr = os_config_read_string(NOX("PXO"),NOX("SquadName"),NULL); - if(ptr == NULL){ - nprintf(("Network","Error reading in PXO squad name\n")); - SDL_strlcpy(Multi_tracker_squad_name, "", sizeof(Multi_tracker_squad_name)); - } else { - SDL_strlcpy(Multi_tracker_squad_name, ptr, sizeof(Multi_tracker_squad_name)); - } // If less than 48MB of RAM, use low memory model. if ( (Freespace_total_ram < 48) || Use_low_mem ) { diff --git a/src/network/multi.cpp b/src/network/multi.cpp index edce8c7..55d84f6 100644 --- a/src/network/multi.cpp +++ b/src/network/multi.cpp @@ -241,6 +241,8 @@ #include "multi_rate.h" #include "hudescort.h" #include "alphacolors.h" +#include "osregistry.h" + // ---------------------------------------------------------------------------------------- // Basic module scope defines @@ -368,6 +370,7 @@ int Multi_current_file_length = -1; void multi_init() { int idx; + const char *ptr = NULL; // read in config file multi_options_read_config(); @@ -399,6 +402,39 @@ void multi_init() // load up common multiplayer icons multi_load_common_icons(); + + + // attempt to load up master tracker registry info (login and password) + Multi_tracker_id = -1; + + // pxo login and password + ptr = os_config_read_string("PXO", "Login", NULL); + + if (ptr) { + SDL_strlcpy(Multi_tracker_login, ptr, SDL_arraysize(Multi_tracker_login)); + } else { + nprintf(("Network", "Error reading in PXO login data\n")); + SDL_zero(Multi_tracker_login); + } + + ptr = os_config_read_string("PXO", "Password", NULL); + + if (ptr) { + SDL_strlcpy(Multi_tracker_passwd, ptr, SDL_arraysize(Multi_tracker_passwd)); + } else { + nprintf(("Network", "Error reading PXO password\n")); + SDL_zero(Multi_tracker_passwd); + } + + // pxo squad name + ptr = os_config_read_string("PXO", "SquadName", NULL); + + if (ptr) { + SDL_strlcpy(Multi_tracker_squad_name, ptr, SDL_arraysize(Multi_tracker_squad_name)); + } else { + nprintf(("Network", "Error reading in PXO squad name\n")); + SDL_zero(Multi_tracker_squad_name); + } } // this is an important function which re-initializes any variables required in multiplayer games. diff --git a/src/network/multi_options.cpp b/src/network/multi_options.cpp index 1f9f053..66d3013 100644 --- a/src/network/multi_options.cpp +++ b/src/network/multi_options.cpp @@ -247,7 +247,7 @@ void multi_options_read_config() Multi_options_g.protocol = NET_TCP; // do we have a forced port via commandline or registry? - ushort forced_port = (ushort)os_config_read_uint(NULL, "ForcePort", 0); + ushort forced_port = (ushort)os_config_read_uint("Network", "ForcePort", 0); Multi_options_g.port = (Cmdline_network_port >= 0) ? (ushort)Cmdline_network_port : forced_port == 0 ? (ushort)DEFAULT_GAME_PORT : forced_port; Multi_options_g.log = (Cmdline_multi_log) ? 1 : 0; diff --git a/src/network/multi_update.cpp b/src/network/multi_update.cpp index 8977a1c..9239721 100644 --- a/src/network/multi_update.cpp +++ b/src/network/multi_update.cpp @@ -242,7 +242,7 @@ int multi_update_gobaby() int my_code = MULTI_UPDATE_MAIN_MENU; // maybe skip - if(os_config_read_uint(NULL, "SkipVerify", 0)){ + if ( os_config_read_uint("Network", "SkipVerify", 0) ) { return MULTI_UPDATE_CONTINUE; } diff --git a/src/network/multiutil.cpp b/src/network/multiutil.cpp index 2d1f8a8..728bdc1 100644 --- a/src/network/multiutil.cpp +++ b/src/network/multiutil.cpp @@ -3115,8 +3115,9 @@ int multi_get_connection_speed() { int cspeed; const char *connection_speed; - - connection_speed = os_config_read_string(NULL, "ConnectionSpeed", ""); + + // 'Fast' should be a safe default in 2015 + connection_speed = os_config_read_string("Network", "ConnectionSpeed", "Fast"); if ( !SDL_strcasecmp(connection_speed, NOX("Slow")) ) { cspeed = CONNECTION_SPEED_288; diff --git a/src/network/psnet2.cpp b/src/network/psnet2.cpp index 6ba7601..5c52292 100644 --- a/src/network/psnet2.cpp +++ b/src/network/psnet2.cpp @@ -661,7 +661,9 @@ void psnet_init( int protocol, int port_num ) return; } - internet_connection = os_config_read_string(NULL, "NetworkConnection", "none"); + // 'lan' should be a safe default in 2015 + internet_connection = os_config_read_string("Network", "NetworkConnection", "LAN"); + if ( !SDL_strcasecmp(internet_connection, NOX("dialup")) ) { ml_string("psnet_init() detected dialup connection"); -- 2.39.2