From cad526ef3658ad6420939a6d51707c9dbfee97c3 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 12 Oct 2006 14:59:27 +0000 Subject: (svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking disabled hardcode _networking/_network_available to zero and let the compiler handle all optimizations. --- openttd.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'openttd.c') diff --git a/openttd.c b/openttd.c index 02ea57537..e46b6a14c 100644 --- a/openttd.c +++ b/openttd.c @@ -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 -- cgit v1.2.3-70-g09d2