From e615fba7f8d970eb13265ff0ae181ecab1fff737 Mon Sep 17 00:00:00 2001
From: click <click@gonnamakeyou.com>
Date: Sat, 25 Feb 2012 20:39:28 +0100
Subject: Revert "Core: Fix the SFMT randgen-initbug" - alignment-fix is now
 properly handled within the respective code

This reverts commit 28310f0938a8776d0cb42ba8a64f125cc42bff6b.
---
 src/server/shared/Utilities/Util.cpp | 5 -----
 src/server/shared/Utilities/Util.h   | 5 -----
 src/server/worldserver/Master.cpp    | 4 +---
 3 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index d3ae82e4ff3..52ce74be8f8 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -31,11 +31,6 @@
 typedef ACE_TSS<SFMTRand> SFMTRandTSS;
 static SFMTRandTSS sfmtRand;
 
-void init_sfmt()
-{
-    sfmtRand->RandomInit((int)(time(0)));
-}
-
 int32 irand(int32 min, int32 max)
 {
     return int32(sfmtRand->IRandom(min, max));
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 1a542ff15e1..4c2c1936993 100755
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -24,11 +24,6 @@
 #include <string>
 #include <vector>
 
-#ifdef USE_SFMT_FOR_RNG
-    // Initialize SFMT before first use, if enabled.
-    void init_sfmt();
-#endif
-
 // Searcher for map of structs
 template<typename T, class S> struct Finder
 {
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 892328dcc81..d84cfc1a4a4 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -139,9 +139,7 @@ int Master::Run()
 #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("Initializing SFMT before first use.");
-    init_sfmt();
+    sLog->outString("freezes or crashes randomly, first, try disabling SFMT in CMAKE configuration");
     sLog->outString("\n");
 #endif //USE_SFMT_FOR_RNG
 
-- 
cgit v1.2.3