diff options
| author | Brian <runningnak3d@gmail.com> | 2010-06-07 14:13:56 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-06-07 14:13:56 -0600 |
| commit | d9127cdee7142a47797a3dafa07f9d8ee0d5d9f7 (patch) | |
| tree | 5792ff35b5ad486cd7e9a5d15f881070d18cf6fd /src | |
| parent | a54624fa39974d7657a7af7ec3887cf921c968df (diff) | |
* Reverted to the old Mersenne Twister till the new one can be properly added
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 2 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 444f181f4a9..00c9898eec8 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -317,7 +317,7 @@ SET(game_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/dep/include + ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/game diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index a0e3a2a93f8..5445401c487 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -33,7 +33,7 @@ #include "Miscellaneous/SharedDefines.h" #include "Grids/GridRefManager.h" #include "Maps/MapRefManager.h" -#include "mersennetwister/MersenneTwister.h" +#include "MersenneTwister.h" #include <bitset> #include <list> diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 2dfe0c6ede1..933fed1c74c 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -35,6 +35,7 @@ SET(shared_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/externals/SFMT ${CMAKE_SOURCE_DIR}/externals/sockets/include ${CMAKE_SOURCE_DIR}/externals/utf8cpp diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index dfeb8f62c4d..14c0431c967 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -22,7 +22,8 @@ #include "socket_include.h" #include "utf8.h" -#include "SFMT.h" +//#include "SFMT.h" +#include "MersenneTwister.h" #include <ace/TSS_T.h> typedef ACE_TSS<MTRand> MTRandTSS; |