Core/Misc: Fix mac build

3 files changed, 20 insertions, 18 deletions

diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index a2d64bfcd77..36b25e92fef 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -87,7 +87,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(guidLow).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*guidLow).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
@@ -312,12 +312,12 @@ public:
 
         if (GameObject::DeleteFromDB(spawnId))
         {
-            handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, std::to_string(spawnId).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, std::to_string(*spawnId).c_str());
             return true;
         }
         else
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(spawnId).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*spawnId).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
@@ -332,7 +332,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(guidLow).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*guidLow).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
@@ -368,7 +368,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(guidLow).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*guidLow).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
@@ -422,7 +422,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(guidLow).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*guidLow).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
@@ -579,7 +579,7 @@ public:
         GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
         if (!object)
         {
-            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(guidLow).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, std::to_string(*guidLow).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 97ec8648d2e..e90ded28df5 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -217,7 +217,7 @@ public:
         CreatureData const* data = sObjectMgr->GetCreatureData(lowGuid);
         if (!data)
         {
-            handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, std::to_string(lowGuid).c_str());
+            handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, std::to_string(*lowGuid).c_str());
             handler->SetSentErrorMessage(true);
             return false;
         }
diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp
index f055bebb89d..692e6c4defa 100644
--- a/src/server/scripts/Events/fireworks_show.cpp
+++ b/src/server/scripts/Events/fireworks_show.cpp
@@ -17,7 +17,6 @@
 
 #include "ScriptMgr.h"
 #include "Containers.h"
-#include "CreatureAIImpl.h"
 #include "EventMap.h"
 #include "GameEventMgr.h"
 #include "GameObject.h"
@@ -735,18 +734,20 @@ public:
 
         static uint32 CheerPicker()
         {
-            uint32 newid = RAND(
+            uint32 ids[] =
+            {
                 SOUND_CHEER_1,
                 SOUND_CHEER_2,
                 SOUND_CHEER_3,
                 SOUND_CHEER_4
-            );
-            return newid;
+            };
+            return Trinity::Containers::SelectRandomContainerElement(ids);
         }
 
         static uint32 FireworksPicker()
         {
-            uint32 newid = RAND(
+            uint32 ids[] =
+            {
                 FIREWORK_SHOW_TYPE_1_RED,
                 FIREWORK_SHOW_TYPE_2_RED,
                 FIREWORK_SHOW_TYPE_1_RED_BIG,
@@ -770,13 +771,14 @@ public:
                 FIREWORK_SHOW_TYPE_2_PURPLE,
                 FIREWORK_SHOW_TYPE_1_PURPLE_BIG,
                 FIREWORK_SHOW_TYPE_2_PURPLE_BIG
-            );
-            return newid;
+            };
+            return Trinity::Containers::SelectRandomContainerElement(ids);
         }
 
         static uint32 FireworksBIGOnlyPicker()
         {
-            uint32 newid = RAND(
+            uint32 ids[] =
+            {
                 FIREWORK_SHOW_TYPE_1_RED_BIG,
                 FIREWORK_SHOW_TYPE_2_RED_BIG,
                 FIREWORK_SHOW_TYPE_1_BLUE_BIG,
@@ -789,8 +791,8 @@ public:
                 FIREWORK_SHOW_TYPE_2_YELLOW_BIG,
                 FIREWORK_SHOW_TYPE_1_PURPLE_BIG,
                 FIREWORK_SHOW_TYPE_2_PURPLE_BIG
-            );
-            return newid;
+            };
+            return Trinity::Containers::SelectRandomContainerElement(ids);
         }
 
         void UpdateAI(uint32 diff) override