Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

12 files changed, 62 insertions, 62 deletions

diff --git a/src/server/scripts/Commands/CMakeLists.txt b/src/server/scripts/Commands/CMakeLists.txt
index eec02c0e106..19c42ba92ad 100644
--- a/src/server/scripts/Commands/CMakeLists.txt
+++ b/src/server/scripts/Commands/CMakeLists.txt
@@ -12,21 +12,22 @@ set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
   Commands/cs_account.cpp
   Commands/cs_achievement.cpp
-  Commands/cs_gm.cpp
-  Commands/cs_npc.cpp
-  Commands/cs_go.cpp
-  Commands/cs_learn.cpp
-  Commands/cs_modify.cpp
   Commands/cs_debug.cpp
-  Commands/cs_tele.cpp
-#  Commands/cs_character.cpp
   Commands/cs_event.cpp
+  Commands/cs_gm.cpp
+  Commands/cs_go.cpp
   Commands/cs_gobject.cpp
+  Commands/cs_gps.cpp
   Commands/cs_honor.cpp
-  Commands/cs_wp.cpp
-  Commands/cs_titles.cpp
+  Commands/cs_learn.cpp
+  Commands/cs_modify.cpp
+  Commands/cs_npc.cpp
   Commands/cs_quest.cpp
   Commands/cs_reload.cpp
+  Commands/cs_tele.cpp
+  Commands/cs_titles.cpp
+  Commands/cs_wp.cpp
+#  Commands/cs_character.cpp
 #  Commands/cs_list.cpp
 #  Commands/cs_lookup.cpp
 #  Commands/cs_pdump.cpp
@@ -54,7 +55,6 @@ set(scripts_STAT_SRCS
 #  Commands/cs_die.cpp
 #  Commands/cs_revive.cpp
 #  Commands/cs_dismount.cpp
-  Commands/cs_gps.cpp
 #  Commands/cs_guid.cpp
 #  Commands/cs_help.cpp
 #  Commands/cs_itemmove.cpp
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 4c192ec1d90..185cf05864d 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -249,7 +249,7 @@ public:
 
     static bool HandleDebugSendOpcodeCommand(ChatHandler* handler, const char* /*args*/)
     {
-        Unit *unit = handler->getSelectedUnit();
+        Unit* unit = handler->getSelectedUnit();
         Player* player = NULL;
         if (!unit || (unit->GetTypeId() != TYPEID_PLAYER))
             player = handler->GetSession()->GetPlayer();
@@ -320,7 +320,7 @@ public:
             }
             else if (type == "appgoguid")
             {
-                GameObject *obj = handler->GetNearbyGameObject();
+                GameObject* obj = handler->GetNearbyGameObject();
                 if (!obj)
                 {
                     handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0);
@@ -332,7 +332,7 @@ public:
             }
             else if (type == "goguid")
             {
-                GameObject *obj = handler->GetNearbyGameObject();
+                GameObject* obj = handler->GetNearbyGameObject();
                 if (!obj)
                 {
                     handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0);
@@ -392,14 +392,14 @@ public:
 
     static bool HandleDebugAreaTriggersCommand(ChatHandler* handler, const char* /*args*/)
     {
-        Player* plr = handler->GetSession()->GetPlayer();
-        if (!plr->isDebugAreaTriggers)
+        Player* player = handler->GetSession()->GetPlayer();
+        if (!player->isDebugAreaTriggers)
         {
             handler->PSendSysMessage(LANG_DEBUG_AREATRIGGER_ON);
-            plr->isDebugAreaTriggers = true;
+            player->isDebugAreaTriggers = true;
         } else {
             handler->PSendSysMessage(LANG_DEBUG_AREATRIGGER_OFF);
-            plr->isDebugAreaTriggers = false;
+            player->isDebugAreaTriggers = false;
         }
         return true;
     }
@@ -489,7 +489,7 @@ public:
                 if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END)
                     continue;
 
-                if (Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
                 {
                     if (Bag* bag = item->ToBag())
                     {
@@ -509,7 +509,7 @@ public:
             std::vector<Item *> &updateQueue = player->GetItemUpdateQueue();
             for (size_t i = 0; i < updateQueue.size(); ++i)
             {
-                Item *item = updateQueue[i];
+                Item* item = updateQueue[i];
                 if (!item) continue;
 
                 Bag *container = item->GetContainer();
@@ -539,7 +539,7 @@ public:
                 if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END)
                     continue;
 
-                Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+                Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
                 if (!item) continue;
 
                 if (item->GetSlot() != i)
@@ -651,7 +651,7 @@ public:
 
             for (size_t i = 0; i < updateQueue.size(); ++i)
             {
-                Item *item = updateQueue[i];
+                Item* item = updateQueue[i];
                 if (!item) continue;
 
                 if (item->GetOwnerGUID() != player->GetGUID())
@@ -667,7 +667,7 @@ public:
                 }
 
                 if (item->GetState() == ITEM_REMOVED) continue;
-                Item *test = player->GetItemByPos(item->GetBagSlot(), item->GetSlot());
+                Item* test = player->GetItemByPos(item->GetBagSlot(), item->GetSlot());
 
                 if (test == NULL)
                 {
@@ -784,7 +784,7 @@ public:
             handler->GetSession()->GetPlayer()->EnterVehicle(target, seatId);
         else
         {
-            Creature *passenger = NULL;
+            Creature* passenger = NULL;
             Trinity::AllCreaturesOfEntryInRange check(handler->GetSession()->GetPlayer(), entry, 20.0f);
             Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(handler->GetSession()->GetPlayer(), passenger, check);
             handler->GetSession()->GetPlayer()->VisitNearbyObject(30.0f, searcher);
@@ -828,7 +828,7 @@ public:
         if (!ve)
             return false;
 
-        Creature *v = new Creature;
+        Creature* v = new Creature;
 
         Map *map = handler->GetSession()->GetPlayer()->GetMap();
 
@@ -877,7 +877,7 @@ public:
         uint32 guid = (uint32)atoi(e);
         uint32 index = (uint32)atoi(f);
 
-        Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
+        Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
 
         if (!i)
             return false;
@@ -908,7 +908,7 @@ public:
         uint32 index = (uint32)atoi(f);
         uint32 value = (uint32)atoi(g);
 
-        Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
+        Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
 
         if (!i)
             return false;
@@ -932,7 +932,7 @@ public:
 
         uint32 guid = (uint32)atoi(e);
 
-        Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
+        Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
 
         if (!i)
             return false;
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 90fbe1d1549..a520eac1ee7 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -89,7 +89,7 @@ public:
         if (!*args)
             return false;
 
-        Player *target =  handler->getSelectedPlayer();
+        Player* target =  handler->getSelectedPlayer();
         if (!target)
             target = handler->GetSession()->GetPlayer();
 
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 7129aa67c99..8393d338e93 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -113,7 +113,7 @@ public:
             if (!guid)
             {
                 std::string name = pParam1;
-                WorldDatabase.escape_string(name);
+                WorldDatabase.EscapeString(name);
                 whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << "'";
             }
             else
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 44d87729719..204012224d5 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -139,7 +139,7 @@ public:
             return false;
         }
 
-        Player *chr = handler->GetSession()->GetPlayer();
+        Player* chr = handler->GetSession()->GetPlayer();
         float x = float(chr->GetPositionX());
         float y = float(chr->GetPositionY());
         float z = float(chr->GetPositionZ());
@@ -190,7 +190,7 @@ public:
         if (!charID)
             return false;
 
-        Player *chr = handler->GetSession()->GetPlayer();
+        Player* chr = handler->GetSession()->GetPlayer();
 
         char* spawntime = strtok(NULL, " ");
         uint32 spawntm = 300;
@@ -233,7 +233,7 @@ public:
             else
             {
                 std::string name = cId;
-                WorldDatabase.escape_string(name);
+                WorldDatabase.EscapeString(name);
                 result = WorldDatabase.PQuery(
                     "SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
                     "FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1",
@@ -411,7 +411,7 @@ public:
         }
         else
         {
-            Player *chr = handler->GetSession()->GetPlayer();
+            Player* chr = handler->GetSession()->GetPlayer();
             o = chr->GetOrientation();
         }
 
@@ -459,7 +459,7 @@ public:
 
         if (!px)
         {
-            Player *chr = handler->GetSession()->GetPlayer();
+            Player* chr = handler->GetSession()->GetPlayer();
             obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation());
             obj->DestroyForNearbyPlayers();
             obj->UpdateObjectVisibility();
diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp
index 93e8674143a..a8086f16043 100644
--- a/src/server/scripts/Commands/cs_gps.cpp
+++ b/src/server/scripts/Commands/cs_gps.cpp
@@ -124,7 +124,7 @@ public:
         return true;
     }
 
-    static bool HandleWPGPSCommand(ChatHandler* handler, const char *args)
+    static bool HandleWPGPSCommand(ChatHandler* handler, const char* /*args*/)
     {
         Player* player = handler->GetSession()->GetPlayer();
 
diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp
index b2ba23c0186..6f44000017d 100644
--- a/src/server/scripts/Commands/cs_honor.cpp
+++ b/src/server/scripts/Commands/cs_honor.cpp
@@ -57,7 +57,7 @@ public:
         if (!*args)
             return false;
 
-        Player *target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayer();
         if (!target)
         {
             handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -92,7 +92,7 @@ public:
     }
     static bool HandleHonorUpdateCommand(ChatHandler* handler, const char* /*args*/)
     {
-        Player *target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayer();
         if (!target)
         {
             handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index b865574cd43..c2371243150 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -440,7 +440,7 @@ public:
         }
         else if (target->ToCreature()->isPet())
         {
-            Unit *owner = target->GetOwner();
+            Unit* owner = target->GetOwner();
             if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)target)->IsPermanentPetFor(owner->ToPlayer()))
             {
                 // check online security
@@ -698,15 +698,15 @@ public:
             return false;
         }
 
-        if (target->GetTypeId()==TYPEID_PLAYER)
+        if (Player* player = target->ToPlayer())
         {
             // check online security
-            if (handler->HasLowerSecurity((Player*)target, 0))
+            if (handler->HasLowerSecurity(player, 0))
                 return false;
 
-            handler->PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, handler->GetNameLink((Player*)target).c_str());
-            if (handler->needReportToTarget((Player*)target))
-                (ChatHandler((Player*)target)).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, handler->GetNameLink().c_str(), Scale);
+            handler->PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, handler->GetNameLink(player).c_str());
+            if (handler->needReportToTarget(player))
+                (ChatHandler(player)).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, handler->GetNameLink().c_str(), Scale);
         }
 
         target->SetFloatValue(OBJECT_FIELD_SCALE_X, Scale);
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index dd526162e66..48f91d9ec30 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -119,7 +119,7 @@ public:
 
         uint32 id  = atoi(charID);
 
-        Player *chr = handler->GetSession()->GetPlayer();
+        Player* chr = handler->GetSession()->GetPlayer();
         float x = chr->GetPositionX();
         float y = chr->GetPositionY();
         float z = chr->GetPositionZ();
@@ -495,7 +495,7 @@ public:
     static bool HandleNpcFollowCommand(ChatHandler* handler, const char* /*args*/)
     {
         Player* player = handler->GetSession()->GetPlayer();
-        Creature *creature = handler->getSelectedCreature();
+        Creature* creature = handler->getSelectedCreature();
 
         if (!creature)
         {
@@ -667,7 +667,7 @@ public:
 
         uint32 displayId = (uint32) atoi((char*)args);
 
-        Creature *pCreature = handler->getSelectedCreature();
+        Creature* pCreature = handler->getSelectedCreature();
 
         if (!pCreature || pCreature->isPet())
         {
@@ -878,7 +878,7 @@ public:
         if (option >0.0f)
             mtype = RANDOM_MOTION_TYPE;
 
-        Creature *pCreature = handler->getSelectedCreature();
+        Creature* pCreature = handler->getSelectedCreature();
         uint32 u_guidlow = 0;
 
         if (pCreature)
@@ -920,7 +920,7 @@ public:
             return false;
         }
 
-        Creature *pCreature = handler->getSelectedCreature();
+        Creature* pCreature = handler->getSelectedCreature();
         uint32 u_guidlow = 0;
 
         if (pCreature)
@@ -986,7 +986,7 @@ public:
     static bool HandleNpcUnFollowCommand(ChatHandler* handler, const char* /*args*/)
     {
         Player* player = handler->GetSession()->GetPlayer();
-        Creature *creature = handler->getSelectedCreature();
+        Creature* creature = handler->getSelectedCreature();
 
         if (!creature)
         {
@@ -1078,7 +1078,7 @@ public:
         if (!charID)
             return false;
 
-        Player *chr = handler->GetSession()->GetPlayer();
+        Player* chr = handler->GetSession()->GetPlayer();
 
         uint32 id = atoi(charID);
         if (!id)
@@ -1092,7 +1092,7 @@ public:
     //npc tame handling
     static bool HandleNpcTameCommand(ChatHandler* handler, const char* /*args*/)
     {
-        Creature *creatureTarget = handler->getSelectedCreature ();
+        Creature* creatureTarget = handler->getSelectedCreature ();
         if (!creatureTarget || creatureTarget->isPet ())
         {
             handler->PSendSysMessage (LANG_SELECT_CREATURE);
@@ -1162,7 +1162,7 @@ public:
             return false;
 
         uint32 leaderGUID = (uint32) atoi((char*)args);
-        Creature *pCreature = handler->getSelectedCreature();
+        Creature* pCreature = handler->getSelectedCreature();
 
         if (!pCreature || !pCreature->GetDBTableGUIDLow())
         {
@@ -1181,7 +1181,7 @@ public:
         if (!lowguid)
             return false;
 
-        Player *chr = handler->GetSession()->GetPlayer();
+        Player* chr = handler->GetSession()->GetPlayer();
         FormationInfo *group_member;
 
         group_member                 = new FormationInfo;
@@ -1248,7 +1248,7 @@ public:
             return true;
         }
 
-        Creature *pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), guid);
+        Creature* pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), guid);
 
         if (!pCreature)
         {
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index 501cfcdb6c3..2bc777afe85 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -228,7 +228,7 @@ public:
 
         for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
         {
-            Player *pl = itr->getSource();
+            Player* pl = itr->getSource();
 
             if (!pl || !pl->GetSession())
                 continue;
diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
index fc268afe75a..2fb22e0090d 100644
--- a/src/server/scripts/Commands/cs_titles.cpp
+++ b/src/server/scripts/Commands/cs_titles.cpp
@@ -210,7 +210,7 @@ public:
 
         sscanf((char*)args, UI64FMTD, &titles);
 
-        Player *target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayer();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 4701591bbcf..1da11795742 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -434,7 +434,7 @@ public:
                 else
                 {
                     std::string arg_str_3 = arg_3;
-                    WorldDatabase.escape_string(arg_str_3);
+                    WorldDatabase.EscapeString(arg_str_3);
                     WorldDatabase.PExecute("UPDATE waypoint_scripts SET %s='%s' WHERE guid='%u'",
                         arg_2, arg_str_3.c_str(), id);
                 }
@@ -569,7 +569,7 @@ public:
         {
             handler->PSendSysMessage("|cff00ff00DEBUG: wp move, PathID: |r|cff00ffff%u|r", pathid);
 
-            Player *chr = handler->GetSession()->GetPlayer();
+            Player* chr = handler->GetSession()->GetPlayer();
             Map *map = chr->GetMap();
             {
                 // wpCreature
@@ -619,7 +619,7 @@ public:
         {
             // show_str check for present in list of correct values, no sql injection possible
             std::string text2 = text;
-            WorldDatabase.escape_string(text2);
+            WorldDatabase.EscapeString(text2);
             WorldDatabase.PExecute("UPDATE waypoint_data SET %s='%s' WHERE id='%u' AND point='%u'",
                 show_str, text2.c_str(), pathid, point);
         }
@@ -776,7 +776,7 @@ public:
 
                 uint32 id = VISUAL_WAYPOINT;
 
-                Player *chr = handler->GetSession()->GetPlayer();
+                Player* chr = handler->GetSession()->GetPlayer();
                 Map *map = chr->GetMap();
                 float o = chr->GetOrientation();
 
@@ -827,7 +827,7 @@ public:
             float z         = fields[2].GetFloat();
             uint32 id = VISUAL_WAYPOINT;
 
-            Player *chr = handler->GetSession()->GetPlayer();
+            Player* chr = handler->GetSession()->GetPlayer();
             float o = chr->GetOrientation();
             Map *map = chr->GetMap();
 
@@ -875,7 +875,7 @@ public:
             float z         = fields[2].GetFloat();
             uint32 id = VISUAL_WAYPOINT;
 
-            Player *chr = handler->GetSession()->GetPlayer();
+            Player* chr = handler->GetSession()->GetPlayer();
             float o = chr->GetOrientation();
             Map *map = chr->GetMap();