diff options
author | skidd13 <skidd13@openttd.org> | 2007-11-21 19:18:34 +0000 |
---|---|---|
committer | skidd13 <skidd13@openttd.org> | 2007-11-21 19:18:34 +0000 |
commit | 1d56af1d33292e92fc7536044dbf37d7d45de303 (patch) | |
tree | 0b75dcf283dfee4f780eed9edfa1d76781efca47 /src/core/random_func.hpp | |
parent | 83601671c7b6aca820b3d55ced8ba30d0c82b4b5 (diff) | |
download | openttd-1d56af1d33292e92fc7536044dbf37d7d45de303.tar.xz |
(svn r11489) -Fix r11488: Somehow the code was added multiple times
Diffstat (limited to 'src/core/random_func.hpp')
-rw-r--r-- | src/core/random_func.hpp | 195 |
1 files changed, 0 insertions, 195 deletions
diff --git a/src/core/random_func.hpp b/src/core/random_func.hpp index 2169c11fb..3806bc01a 100644 --- a/src/core/random_func.hpp +++ b/src/core/random_func.hpp @@ -37,198 +37,3 @@ uint32 InteractiveRandom(); // Used for random sequences that are not the same o uint InteractiveRandomRange(uint max); #endif /* RANDOM_FUNC_HPP */ -/* $Id$ */ - -/** @file random_func.h */ - -#ifndef RANDOM_FUNC_HPP -#define RANDOM_FUNC_HPP - -/************** - * Warning: DO NOT enable this unless you understand what it does - * - * If enabled, in a network game all randoms will be dumped to the - * stdout if the first client joins (or if you are a client). This - * is to help finding desync problems. - * - * Warning: DO NOT enable this unless you understand what it does - **************/ - -//#define RANDOM_DEBUG - - -// Enable this to produce higher quality random numbers. -// Doesn't work with network yet. -// #define MERSENNE_TWISTER - -void SetRandomSeed(uint32 seed); -#ifdef RANDOM_DEBUG - #define Random() DoRandom(__LINE__, __FILE__) - uint32 DoRandom(int line, const char *file); - #define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__) - uint DoRandomRange(uint max, int line, const char *file); -#else - uint32 Random(); - uint RandomRange(uint max); -#endif - -uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link -uint InteractiveRandomRange(uint max); - -#endif /* RANDOM_FUNC_HPP */ -/* $Id$ */ - -/** @file random_func.h */ - -#ifndef RANDOM_FUNC_HPP -#define RANDOM_FUNC_HPP - -/************** - * Warning: DO NOT enable this unless you understand what it does - * - * If enabled, in a network game all randoms will be dumped to the - * stdout if the first client joins (or if you are a client). This - * is to help finding desync problems. - * - * Warning: DO NOT enable this unless you understand what it does - **************/ - -//#define RANDOM_DEBUG - - -// Enable this to produce higher quality random numbers. -// Doesn't work with network yet. -// #define MERSENNE_TWISTER - -void SetRandomSeed(uint32 seed); -#ifdef RANDOM_DEBUG - #define Random() DoRandom(__LINE__, __FILE__) - uint32 DoRandom(int line, const char *file); - #define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__) - uint DoRandomRange(uint max, int line, const char *file); -#else - uint32 Random(); - uint RandomRange(uint max); -#endif - -uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link -uint InteractiveRandomRange(uint max); - -#endif /* RANDOM_FUNC_HPP */ -/* $Id$ */ - -/** @file random_func.h */ - -#ifndef RANDOM_FUNC_HPP -#define RANDOM_FUNC_HPP - -/************** - * Warning: DO NOT enable this unless you understand what it does - * - * If enabled, in a network game all randoms will be dumped to the - * stdout if the first client joins (or if you are a client). This - * is to help finding desync problems. - * - * Warning: DO NOT enable this unless you understand what it does - **************/ - -//#define RANDOM_DEBUG - - -// Enable this to produce higher quality random numbers. -// Doesn't work with network yet. -// #define MERSENNE_TWISTER - -void SetRandomSeed(uint32 seed); -#ifdef RANDOM_DEBUG - #define Random() DoRandom(__LINE__, __FILE__) - uint32 DoRandom(int line, const char *file); - #define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__) - uint DoRandomRange(uint max, int line, const char *file); -#else - uint32 Random(); - uint RandomRange(uint max); -#endif - -uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link -uint InteractiveRandomRange(uint max); - -#endif /* RANDOM_FUNC_HPP */ -/* $Id$ */ - -/** @file random_func.h */ - -#ifndef RANDOM_FUNC_HPP -#define RANDOM_FUNC_HPP - -/************** - * Warning: DO NOT enable this unless you understand what it does - * - * If enabled, in a network game all randoms will be dumped to the - * stdout if the first client joins (or if you are a client). This - * is to help finding desync problems. - * - * Warning: DO NOT enable this unless you understand what it does - **************/ - -//#define RANDOM_DEBUG - - -// Enable this to produce higher quality random numbers. -// Doesn't work with network yet. -// #define MERSENNE_TWISTER - -void SetRandomSeed(uint32 seed); -#ifdef RANDOM_DEBUG - #define Random() DoRandom(__LINE__, __FILE__) - uint32 DoRandom(int line, const char *file); - #define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__) - uint DoRandomRange(uint max, int line, const char *file); -#else - uint32 Random(); - uint RandomRange(uint max); -#endif - -uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link -uint InteractiveRandomRange(uint max); - -#endif /* RANDOM_FUNC_HPP */ -/* $Id$ */ - -/** @file random_func.h */ - -#ifndef RANDOM_FUNC_HPP -#define RANDOM_FUNC_HPP - -/************** - * Warning: DO NOT enable this unless you understand what it does - * - * If enabled, in a network game all randoms will be dumped to the - * stdout if the first client joins (or if you are a client). This - * is to help finding desync problems. - * - * Warning: DO NOT enable this unless you understand what it does - **************/ - -//#define RANDOM_DEBUG - - -// Enable this to produce higher quality random numbers. -// Doesn't work with network yet. -// #define MERSENNE_TWISTER - -void SetRandomSeed(uint32 seed); -#ifdef RANDOM_DEBUG - #define Random() DoRandom(__LINE__, __FILE__) - uint32 DoRandom(int line, const char *file); - #define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__) - uint DoRandomRange(uint max, int line, const char *file); -#else - uint32 Random(); - uint RandomRange(uint max); -#endif - -uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link -uint InteractiveRandomRange(uint max); - -#endif /* RANDOM_FUNC_HPP */ |