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

(svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug.

release/1.5
peter1138 2014-10-28 11:32:19 +00:00
parent c2dbe23c88
commit cea2c3490a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/random_func.cpp
View File

@ -13,6 +13,15 @@
#include "random_func.hpp" #include "random_func.hpp"
#include "bitmath_func.hpp" #include "bitmath_func.hpp"
#ifdef RANDOM_DEBUG
#include "../network/network.h"
#include "../network/network_server.h"
#include "../network/network_internal.h"
#include "../company_func.h"
#include "../fileio_func.h"
#include "../date_func.h"
#endif /* RANDOM_DEBUG */
#include "../safeguards.h" #include "../safeguards.h"
Randomizer _random, _interactive_random; Randomizer _random, _interactive_random;
@ -62,13 +71,6 @@ void SetRandomSeed(uint32 seed)
} }
#ifdef RANDOM_DEBUG #ifdef RANDOM_DEBUG
#include "../network/network.h"
#include "../network/network_server.h"
#include "../network/network_internal.h"
#include "../company_func.h"
#include "../fileio_func.h"
#include "../date_func.h"
uint32 DoRandom(int line, const char *file) uint32 DoRandom(int line, const char *file)
{ {
if (_networking && (!_network_server || (NetworkClientSocket::IsValidID(0) && NetworkClientSocket::Get(0)->status != NetworkClientSocket::STATUS_INACTIVE))) { if (_networking && (!_network_server || (NetworkClientSocket::IsValidID(0) && NetworkClientSocket::Get(0)->status != NetworkClientSocket::STATUS_INACTIVE))) {