Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index dacb2278b64..8b6862fa760 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -20,6 +20,7 @@
 #include "Common.h"
 #include "utf8.h"
 #include "SFMT.h"
+#include "Errors.h" // for ASSERT
 #include <ace/TSS_T.h>
 #include <ace/INET_Addr.h>
 
@@ -28,19 +29,19 @@ static SFMTRandTSS sfmtRand;
 
 int32 irand(int32 min, int32 max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return int32(sfmtRand->IRandom(min, max));
 }
 
 uint32 urand(uint32 min, uint32 max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return sfmtRand->URandom(min, max);
 }
 
 float frand(float min, float max)
 {
-    assert(max >= min);
+    ASSERT(max >= min);
     return float(sfmtRand->Random() * (max - min) + min);
 }