From a9c9ab0efa7e41c31f52e71749048300d809d69a Mon Sep 17 00:00:00 2001
From: click <click@gonnamakeyou.com>
Date: Fri, 1 Jul 2011 03:00:39 +0200
Subject: Core: Clean up script variables to make variables
 consistant/standardized, and some additional warning-removals: + Fix
 compilewarning in Unit.cpp + Remove/comment out unused parameters for some
 commandscripts/scripts (warnings) + Replace "plr" with "player" all over the
 scriptbase for consistency

---
 src/server/scripts/Commands/cs_debug.cpp  |  8 ++++----
 src/server/scripts/Commands/cs_gps.cpp    |  2 +-
 src/server/scripts/Commands/cs_modify.cpp | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/server/scripts/Commands')

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 41e456289e0..185cf05864d 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -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;
     }
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_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index b54e9519da5..c2371243150 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -698,15 +698,15 @@ public:
             return false;
         }
 
-        if (Player* plr = target->ToPlayer())
+        if (Player* player = target->ToPlayer())
         {
             // check online security
-            if (handler->HasLowerSecurity(plr, 0))
+            if (handler->HasLowerSecurity(player, 0))
                 return false;
 
-            handler->PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, handler->GetNameLink(plr).c_str());
-            if (handler->needReportToTarget(plr))
-                (ChatHandler(plr)).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);
-- 
cgit v1.2.3