Core: Remove the MersenneTwiser-library (SFMT is now considered stable enough for full deployment)

2 files changed, 0 insertions, 47 deletions

diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 52ce74be8f8..7bedf9690ca 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -19,15 +19,10 @@
 #include <iostream>
 #include "Util.h"
 #include "utf8.h"
-#ifdef USE_SFMT_FOR_RNG
 #include "SFMT.h"
-#else
-#include "MersenneTwister.h"
-#endif
 #include <ace/TSS_T.h>
 #include <ace/INET_Addr.h>
 
-#ifdef USE_SFMT_FOR_RNG
 typedef ACE_TSS<SFMTRand> SFMTRandTSS;
 static SFMTRandTSS sfmtRand;
 
@@ -61,41 +56,6 @@ double rand_chance(void)
     return sfmtRand->Random() * 100.0;
 }
 
-#else
-typedef ACE_TSS<MTRand> MTRandTSS;
-static MTRandTSS mtRand;
-
-int32 irand(int32 min, int32 max)
-{
-    return int32(mtRand->randInt(max - min)) + min;
-}
-
-uint32 urand(uint32 min, uint32 max)
-{
-    return mtRand->randInt(max - min) + min;
-}
-
-float frand(float min, float max)
-{
-    return float(mtRand->randExc(max - min) + min);
-}
-
-int32 rand32()
-{
-    return mtRand->randInt();
-}
-
-double rand_norm(void)
-{
-    return mtRand->randExc();
-}
-
-double rand_chance(void)
-{
-    return mtRand->randExc(100.0);
-}
-#endif
-
 Tokens::Tokens(const std::string &src, const char sep, uint32 vectorReserve)
 {
     m_str = new char[src.length() + 1];
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index f1be4a6889b..f4945e025b0 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -137,13 +137,6 @@ int Master::Run()
     sLog->outString("                                 C O R E  /\\___/");
     sLog->outString("http://TrinityCore.org                    \\/__/\n");
 
-#ifdef USE_SFMT_FOR_RNG
-    sLog->outString("\n");
-    sLog->outString("SFMT has been enabled as the random number generator, if worldserver");
-    sLog->outString("freezes or crashes randomly, first, try disabling SFMT in CMAKE configuration");
-    sLog->outString("\n");
-#endif //USE_SFMT_FOR_RNG
-
     /// worldserver PID file creation
     std::string pidfile = ConfigMgr::GetStringDefault("PidFile", "");
     if (!pidfile.empty())