mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3621) - Codechange: Only define the server and bans list if network is enabled. Preparatory work for saving patches/settings to savegame.

release/0.5
Darkvater 2006-02-20 17:49:26 +00:00
parent 4f9ea7640a
commit 4b5970da84
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
network.h
View File

@ -212,13 +212,12 @@ NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool
byte NetworkSpectatorCount(void); byte NetworkSpectatorCount(void);
VARDEF char *_network_host_list[10];
VARDEF char *_network_ban_list[25];
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
// Those variables must always be registered! // Those variables must always be registered!
#define MAX_SAVED_SERVERS 10
VARDEF char *_network_host_list[MAX_SAVED_SERVERS];
#define MAX_BANS 25
VARDEF char *_network_ban_list[MAX_BANS];
VARDEF bool _networking; VARDEF bool _networking;
VARDEF bool _network_available; // is network mode available? VARDEF bool _network_available; // is network mode available?
VARDEF bool _network_server; // network-server is active VARDEF bool _network_server; // network-server is active

4
settings.c
View File

@ -1124,8 +1124,10 @@ void LoadFromConfig(void)
IniFile *ini = ini_load(_config_file); IniFile *ini = ini_load(_config_file);
HandleSettingDescs(ini, load_setting_desc); HandleSettingDescs(ini, load_setting_desc);
LoadList(ini, "newgrf", _newgrf_files, lengthof(_newgrf_files)); LoadList(ini, "newgrf", _newgrf_files, lengthof(_newgrf_files));
#ifdef ENABLE_NETWORK
LoadList(ini, "servers", _network_host_list, lengthof(_network_host_list)); LoadList(ini, "servers", _network_host_list, lengthof(_network_host_list));
LoadList(ini, "bans", _network_ban_list, lengthof(_network_ban_list)); LoadList(ini, "bans", _network_ban_list, lengthof(_network_ban_list));
#endif /* ENABLE_NETWORK */
ini_free(ini); ini_free(ini);
} }
@ -1133,8 +1135,10 @@ void SaveToConfig(void)
{ {
IniFile *ini = ini_load(_config_file); IniFile *ini = ini_load(_config_file);
HandleSettingDescs(ini, save_setting_desc); HandleSettingDescs(ini, save_setting_desc);
#ifdef ENABLE_NETWORK
SaveList(ini, "servers", _network_host_list, lengthof(_network_host_list)); SaveList(ini, "servers", _network_host_list, lengthof(_network_host_list));
SaveList(ini, "bans", _network_ban_list, lengthof(_network_ban_list)); SaveList(ini, "bans", _network_ban_list, lengthof(_network_ban_list));
#endif /* ENABLE_NETWORK */
ini_save(_config_file, ini); ini_save(_config_file, ini);
ini_free(ini); ini_free(ini);
} }