Convert Modify commands to CommandScript

Improved spacing in cs_gameobject
Arkania · Jan 6, 2013 · 98bd80f · 98bd80f
1 parent 9083474
commit 98bd80f
Show file tree

Hide file tree

Showing 8 changed files with 1,481 additions and 1,478 deletions.
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -186,7 +186,7 @@ void PetAI::UpdateAI(const uint32 diff)
             // Fix to allow pets on STAY to autocast
             if (me->getVictim() && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
             {
-                targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(me->getVictim(), spell));
+                targetSpellStore.push_back(std::make_pair(me->getVictim(), spell));
                 continue;
             }
             else
@@ -202,7 +202,7 @@ void PetAI::UpdateAI(const uint32 diff)
 
                     if (spell->CanAutoCast(Target))
                     {
-                        targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(Target, spell));
+                        targetSpellStore.push_back(std::make_pair(Target, spell));
                         spellUsed = true;
                         break;
                     }

diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
@@ -263,39 +263,7 @@ ChatCommand * ChatHandler::getCommandTable ()
     { "map", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupMapCommand>, "", NULL },
     { "npc", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupCreatureCommand>, "", NULL },
     { NULL, 0, false, NULL, "", NULL } };
-
-    static ChatCommand modifyCommandTable[] =
-    {
-    { "hp", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyHPCommand>, "", NULL },
-    { "mana", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyManaCommand>, "", NULL },
-    { "rage", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyRageCommand>, "", NULL },
-    { "runicpower", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyRunicPowerCommand>, "", NULL },
-    { "energy", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyEnergyCommand>, "", NULL },
-    { "money", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyMoneyCommand>, "", NULL },
-    { "speed", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifySpeedCommand>, "", NULL },
-    { "swim", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifySwimCommand>, "", NULL },
-    { "scale", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyScaleCommand>, "", NULL },
-    { "bit", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyBitCommand>, "", NULL },
-    { "bwalk", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyBWalkCommand>, "", NULL },
-    { "fly", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyFlyCommand>, "", NULL },
-    { "aspeed", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyASpeedCommand>, "", NULL },
-    { "faction", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyFactionCommand>, "", NULL },
-    { "spell", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifySpellCommand>, "", NULL },
-    { "tp", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyTalentCommand>, "", NULL },
-    { "mount", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyMountCommand>, "", NULL },
-    { "currency", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyCurrencyCommand>, "", NULL },
-    { "rep", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleModifyRepCommand>, "", NULL },
-    { "drunk", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleModifyDrunkCommand>, "", NULL },
-    { "standstate", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleModifyStandStateCommand>, "", NULL },
-    { "morph", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleModifyMorphCommand>, "", NULL },
-    { "phase", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleModifyPhaseCommand>, "", NULL },
-    { "gender", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleModifyGenderCommand>, "", NULL },
-	{ "honor",          SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleModifyHonorCommand>,         "", NULL },
-        { "conquest",       SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleModifyHonorCommand>,         "", NULL },
-        { "valor",          SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleModifyHonorCommand>,         "", NULL },
-        { "justice",        SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleModifyHonorCommand>,         "", NULL },	
-    { NULL, 0, false, NULL, "", NULL } };
-
+
     static ChatCommand petCommandTable[] =
     {
     { "create", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleCreatePetCommand>, "", NULL },
@@ -437,7 +405,6 @@ ChatCommand * ChatHandler::getCommandTable ()
     { "gm", SEC_MODERATOR, true, NULL, "", gmCommandTable },
     { "go", SEC_MODERATOR, false, NULL, "", goCommandTable },
     { "learn", SEC_MODERATOR, false, NULL, "", learnCommandTable },
-    { "modify", SEC_MODERATOR, false, NULL, "", modifyCommandTable },
     { "tele", SEC_MODERATOR, true, NULL, "", teleCommandTable },
     { "character", SEC_GAMEMASTER, true, NULL, "", characterCommandTable },
     { "event", SEC_GAMEMASTER, false, NULL, "", eventCommandTable },

diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
@@ -291,32 +291,6 @@ class ChatHandler
     bool HandleLookupMapCommand (const char* args);
     bool HandleLookupTitleCommand (const char * args);
 
-    bool HandleModifyHPCommand (const char* args);
-    bool HandleModifyManaCommand (const char* args);
-    bool HandleModifyRageCommand (const char* args);
-    bool HandleModifyRunicPowerCommand (const char* args);
-    bool HandleModifyEnergyCommand (const char* args);
-    bool HandleModifyMoneyCommand (const char* args);
-    bool HandleModifyASpeedCommand (const char* args);
-    bool HandleModifySpeedCommand (const char* args);
-    bool HandleModifyBWalkCommand (const char* args);
-    bool HandleModifyFlyCommand (const char* args);
-    bool HandleModifySwimCommand (const char* args);
-    bool HandleModifyScaleCommand (const char* args);
-    bool HandleModifyMountCommand (const char* args);
-    bool HandleModifyBitCommand (const char* args);
-    bool HandleModifyFactionCommand (const char* args);
-    bool HandleModifySpellCommand (const char* args);
-    bool HandleModifyTalentCommand (const char* args);
-    bool HandleModifyCurrencyCommand (const char* args);
-    bool HandleModifyRepCommand (const char* args);
-    bool HandleModifyPhaseCommand (const char* args);
-    bool HandleModifyGenderCommand (const char* args);
-	bool HandleModifyHonorCommand(const char* args);
-    bool HandleModifyConquestCommand(const char* args);
-    bool HandleModifyValorCommand(const char* args);
-    bool HandleModifyJusticeCommand(const char* args);	
-
     bool HandleOpcodeTestCommand (const char* args);
 
     bool HandlePDumpLoadCommand (const char *args);