From ee5eb215e955dc721e136292ac8451bc66574914 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 17 May 2015 16:16:32 +0200
Subject: Scripts/Commands: Change few commands to target current Player by
 default

(cherry picked from commit d1efb90ae88bfb30ad13c48eef5d6c19ce5739e2)
---
 src/server/scripts/Commands/cs_modify.cpp | 44 ++++++++-----------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

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

diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index e63e9e98527..674b6dd74ee 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -133,7 +133,7 @@ public:
             return false;
         }
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -161,17 +161,6 @@ public:
         if (!*args)
             return false;
 
-        // char* pmana = strtok((char*)args, " ");
-        // if (!pmana)
-        //     return false;
-
-        // char* pmanaMax = strtok(NULL, " ");
-        // if (!pmanaMax)
-        //     return false;
-
-        // int32 manam = atoi(pmanaMax);
-        // int32 mana = atoi(pmana);
-
         int32 energy = atoi((char*)args)*10;
         int32 energym = atoi((char*)args)*10;
 
@@ -182,7 +171,7 @@ public:
             return false;
         }
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -212,17 +201,6 @@ public:
         if (!*args)
             return false;
 
-        // char* pmana = strtok((char*)args, " ");
-        // if (!pmana)
-        //     return false;
-
-        // char* pmanaMax = strtok(NULL, " ");
-        // if (!pmanaMax)
-        //     return false;
-
-        // int32 manam = atoi(pmanaMax);
-        // int32 mana = atoi(pmana);
-
         int32 rage = atoi((char*)args)*10;
         int32 ragem = atoi((char*)args)*10;
 
@@ -233,7 +211,7 @@ public:
             return false;
         }
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -271,7 +249,7 @@ public:
             return false;
         }
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -387,7 +365,7 @@ public:
         else
             mark = atoi(pmark);
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (target == NULL)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -946,7 +924,7 @@ public:
             return false;
         }
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -987,7 +965,7 @@ public:
         if (!*args)
             return false;
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1112,7 +1090,7 @@ public:
         if (!*args)
             return false;
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -1142,7 +1120,7 @@ public:
         if (drunklevel > 100)
             drunklevel = 100;
 
-        if (Player* target = handler->getSelectedPlayer())
+        if (Player* target = handler->getSelectedPlayerOrSelf())
             target->SetDrunkValue(drunklevel);
 
         return true;
@@ -1153,7 +1131,7 @@ public:
         if (!*args)
             return false;
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
         if (!target)
         {
             handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -1306,7 +1284,7 @@ public:
         if (!*args)
             return false;
 
-        Player* target = handler->getSelectedPlayer();
+        Player* target = handler->getSelectedPlayerOrSelf();
 
         if (!target)
         {
-- 
cgit v1.2.3