Merge branch 'master' into 4.x

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h

1 files changed, 19 insertions, 8 deletions

diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 5919529c6bf..6ae43bc6840 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -30,17 +30,22 @@
 typedef ACE_TSS<SFMTRand> SFMTRandTSS;
 static SFMTRandTSS sfmtRand;
 
-int32 irand (int32 min, int32 max)
+int32 irand(int32 min, int32 max)
 {
     return int32(sfmtRand->IRandom(min, max));
 }
 
-uint32 urand (uint32 min, uint32 max)
+uint32 urand(uint32 min, uint32 max)
 {
     return sfmtRand->URandom(min, max);
 }
 
-int32 rand32 ()
+float frand(float min, float max)
+{
+    return float(sfmtRand->Random() * (max - min) + min);
+}
+
+int32 rand32()
 {
     return int32(sfmtRand->BRandom());
 }
@@ -50,27 +55,33 @@ double rand_norm(void)
     return sfmtRand->Random();
 }
 
-double rand_chance (void)
+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;
+    return int32(mtRand->randInt(max - min)) + min;
 }
 
 uint32 urand(uint32 min, uint32 max)
 {
-    return mtRand->randInt (max - min) + min;
+    return mtRand->randInt(max - min) + min;
+}
+
+float frand(float min, float max)
+{
+    return float(mtRand->randExc(max - min) + min);
 }
 
 int32 rand32()
 {
-    return mtRand->randInt ();
+    return mtRand->randInt();
 }
 
 double rand_norm(void)