Merge pull request #5733 from GyxTom/master

Core/Script: Clean-ups in scripts

4 files changed, 17 insertions, 13 deletions

diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index df83fe8118f..86818e2c931 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -382,7 +382,7 @@ public:
 
         // Let set addon state only for lesser (strong) security level
         // or to self account
-        if (handler->GetSession() && handler->GetSession()->GetAccountId () != accountId &&
+        if (handler->GetSession() && handler->GetSession()->GetAccountId() != accountId &&
             handler->HasLowerSecurityAccount(NULL, accountId, true))
             return false;
 
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index 358eaacd4f7..32ee96dacfe 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -360,7 +360,9 @@ public:
     //Edit Player Spell
     static bool HandleModifySpellCommand(ChatHandler* handler, const char* args)
     {
-        if (!*args) return false;
+        if (!*args)
+            return false;
+
         char* pspellflatid = strtok((char*)args, " ");
         if (!pspellflatid)
             return false;
@@ -1141,10 +1143,10 @@ public:
 
     static bool HandleModifyRepCommand(ChatHandler* handler, const char* args)
     {
-        if (!*args) return false;
+        if (!*args)
+            return false;
 
         Player* target = handler->getSelectedPlayer();
-
         if (!target)
         {
             handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 67ac6f8ff76..af6952cdf40 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -108,6 +108,7 @@ public:
     {
         if (!*args)
             return false;
+
         char* charID = handler->extractKeyFromLink((char*)args, "Hcreature_entry");
         if (!charID)
             return false;
@@ -135,7 +136,7 @@ public:
             return true;
         }
 
-        Creature* creature = new Creature;
+        Creature* creature = new Creature();
         if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
         {
             delete creature;
@@ -1036,7 +1037,7 @@ public:
         }
 
         if (/*creature->GetMotionMaster()->empty() ||*/
-            creature->GetMotionMaster()->GetCurrentMovementGeneratorType () != FOLLOW_MOTION_TYPE)
+            creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FOLLOW_MOTION_TYPE)
         {
             handler->PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName());
             handler->SetSentErrorMessage(true);
@@ -1131,17 +1132,17 @@ public:
     //npc tame handling
     static bool HandleNpcTameCommand(ChatHandler* handler, const char* /*args*/)
     {
-        Creature* creatureTarget = handler->getSelectedCreature ();
-        if (!creatureTarget || creatureTarget->isPet ())
+        Creature* creatureTarget = handler->getSelectedCreature();
+        if (!creatureTarget || creatureTarget->isPet())
         {
             handler->PSendSysMessage (LANG_SELECT_CREATURE);
             handler->SetSentErrorMessage (true);
             return false;
         }
 
-        Player* player = handler->GetSession()->GetPlayer ();
+        Player* player = handler->GetSession()->GetPlayer();
 
-        if (player->GetPetGUID ())
+        if (player->GetPetGUID())
         {
             handler->SendSysMessage (LANG_YOU_ALREADY_HAVE_PET);
             handler->SetSentErrorMessage (true);
@@ -1168,8 +1169,8 @@ public:
 
         // place pet before player
         float x, y, z;
-        player->GetClosePoint (x, y, z, creatureTarget->GetObjectSize (), CONTACT_DISTANCE);
-        pet->Relocate (x, y, z, M_PI-player->GetOrientation ());
+        player->GetClosePoint (x, y, z, creatureTarget->GetObjectSize(), CONTACT_DISTANCE);
+        pet->Relocate(x, y, z, M_PI-player->GetOrientation());
 
         // set pet to defensive mode by default (some classes can't control controlled pets in fact).
         pet->SetReactState(REACT_DEFENSIVE);
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 9249cb3fdbc..eb59007b40b 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -277,7 +277,8 @@ public:
         std::string show = show_str;
 
         // Check
-        if ((show != "add") && (show != "mod") && (show != "del") && (show != "listid")) return false;
+        if ((show != "add") && (show != "mod") && (show != "del") && (show != "listid"))
+            return false;
 
         char* arg_id = strtok(NULL, " ");
         uint32 id = 0;