diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-09 09:59:35 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-09 09:59:35 +0000 |
| commit | c2221885f488b9a7ca52b11e621582d4c60ab80d (patch) | |
| tree | b793601f63728bb573ffd9825355792c89d7e315 /src/network | |
| parent | 37027467567dd0b75bbb932cdab87da3ff24dedd (diff) | |
| download | openttd-c2221885f488b9a7ca52b11e621582d4c60ab80d.tar.xz | |
(svn r18027) -Codechange: make some unneededly global variables static and remove some unused variables
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network.cpp | 5 | ||||
| -rw-r--r-- | src/network/network_gamelist.cpp | 4 | ||||
| -rw-r--r-- | src/network/network_internal.h | 5 | ||||
| -rw-r--r-- | src/network/network_udp.cpp | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp index 5255b30ef..46cf1a4bb 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -67,7 +67,10 @@ uint32 _frame_counter_max; // To where we may go with our clients uint32 _frame_counter; uint32 _last_sync_frame; // Used in the server to store the last time a sync packet was sent to clients. NetworkAddressList _broadcast_list; -uint32 _sync_seed_1, _sync_seed_2; +uint32 _sync_seed_1; +#ifdef NETWORK_SEND_DOUBLE_SEED +uint32 _sync_seed_2; +#endif uint32 _sync_frame; bool _network_first_time; bool _network_udp_server; diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp index cef15affa..f0a3fb5c9 100644 --- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -23,8 +23,8 @@ NetworkGameList *_network_game_list = NULL; -ThreadMutex *_network_game_list_mutex = ThreadMutex::New(); -NetworkGameList *_network_game_delayed_insertion_list = NULL; +static ThreadMutex *_network_game_list_mutex = ThreadMutex::New(); +static NetworkGameList *_network_game_delayed_insertion_list = NULL; /** Add a new item to the linked gamelist, but do it delayed in the next tick * or so to prevent race conditions. diff --git a/src/network/network_internal.h b/src/network/network_internal.h index b894d17b9..405b938cc 100644 --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -112,7 +112,10 @@ extern uint32 _last_sync_frame; // Used in the server to store the last time a s /* networking settings */ extern NetworkAddressList _broadcast_list; -extern uint32 _sync_seed_1, _sync_seed_2; +extern uint32 _sync_seed_1; +#ifdef NETWORK_SEND_DOUBLE_SEED +extern uint32 _sync_seed_2; +#endif extern uint32 _sync_frame; extern bool _network_first_time; /* Vars needed for the join-GUI */ diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index a4b388e91..acf1afb2d 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -29,7 +29,7 @@ #include "core/udp.h" -ThreadMutex *_network_udp_mutex = ThreadMutex::New(); +static ThreadMutex *_network_udp_mutex = ThreadMutex::New(); /** Session key to register ourselves to the master server */ static uint64 _session_key = 0; |