petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking

Browse Source 
disabled hardcode _networking/_network_available to zero and let the compiler
 handle all optimizations.
This commit is contained in:
Darkvater
2006-10-12 14:59:27 +00:00
parent 15bf48acfd
commit cad526ef36
11 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
openttd.c
View File

@@ -453,10 +453,7 @@ int ttd_main(int argc, char *argv[])
// restore saved music volume
_music_driver->set_volume(msf.music_vol);
#ifdef ENABLE_NETWORK
// initialize network-core
NetworkStartUp();
#endif /* ENABLE_NETWORK */
NetworkStartUp(); // initialize network-core
_opt_ptr = &_opt_newgame;
@@ -505,12 +502,7 @@ int ttd_main(int argc, char *argv[])
WaitTillSaved();
IConsoleFree();
#ifdef ENABLE_NETWORK
if (_network_available) {
// Shut down the network and close any open connections
NetworkDisconnect();
}
#endif /* ENABLE_NETWORK */
if (_network_available) NetworkShutDown(); // Shut down the network and close any open connections
_video_driver->stop();
_music_driver->stop();
@@ -986,8 +978,7 @@ void GameLoop(void)
#ifdef ENABLE_NETWORK
// Check for UDP stuff
if (_network_available)
NetworkUDPGameLoop();
if (_network_available) NetworkUDPGameLoop();
if (_networking && !IsGeneratingWorld()) {
// Multiplayer