azerothcore/azerothcore-wotlk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix commands and starting to use nullptr instead of NULL

Browse Source
This commit is contained in:
Yehonal
2016-08-20 09:49:37 +02:00
parent d7fdf7c940
commit 1b1767e9f4
32 changed files with 394 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/scripts/Commands/cs_learn.cpp
View File

@@ -32,33 +32,29 @@ public:
{ "class", SEC_ADMINISTRATOR, false, &HandleLearnAllMyClassCommand, "" },
{ "pettalents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyPetTalentsCommand, "" },
{ "spells", SEC_ADMINISTRATOR, false, &HandleLearnAllMySpellsCommand, "" },
{ "talents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyTalentsCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "talents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyTalentsCommand, "" }
};
static std::vector<ChatCommand> learnAllCommandTable =
{
{ "my", SEC_ADMINISTRATOR, false, NULL, "", learnAllMyCommandTable },
{ "my", SEC_ADMINISTRATOR, false, nullptr, "", learnAllMyCommandTable },
{ "gm", SEC_GAMEMASTER, false, &HandleLearnAllGMCommand, "" },
{ "crafts", SEC_GAMEMASTER, false, &HandleLearnAllCraftsCommand, "" },
{ "default", SEC_GAMEMASTER, false, &HandleLearnAllDefaultCommand, "" },
{ "lang", SEC_GAMEMASTER, false, &HandleLearnAllLangCommand, "" },
{ "recipes", SEC_GAMEMASTER, false, &HandleLearnAllRecipesCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "recipes", SEC_GAMEMASTER, false, &HandleLearnAllRecipesCommand, "" }
};
static std::vector<ChatCommand> learnCommandTable =
{
{ "all", SEC_ADMINISTRATOR, false, NULL, "", learnAllCommandTable },
{ "", SEC_ADMINISTRATOR, false, &HandleLearnCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "all", SEC_ADMINISTRATOR, false, nullptr, "", learnAllCommandTable },
{ "", SEC_ADMINISTRATOR, false, &HandleLearnCommand, "" }
};
static std::vector<ChatCommand> commandTable =
{
{ "learn", SEC_GAMEMASTER, false, NULL, "", learnCommandTable },
{ "unlearn", SEC_ADMINISTRATOR, false, &HandleUnLearnCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "learn", SEC_GAMEMASTER, false, nullptr, "", learnCommandTable },
{ "unlearn", SEC_ADMINISTRATOR, false, &HandleUnLearnCommand, "" }
};
return commandTable;
}
@@ -103,7 +99,7 @@ public:
return false;
}
char const* all = strtok(NULL, " ");
char const* all = strtok(nullptr, " ");
bool allRanks = all ? (strncmp(all, "all", strlen(all)) == 0) : false;
if (!allRanks && targetPlayer->HasSpell(spell))
@@ -389,7 +385,7 @@ public:
std::string name;
SkillLineEntry const* targetSkillInfo = NULL;
SkillLineEntry const* targetSkillInfo = nullptr;
for (uint32 i = 1; i < sSkillLineStore.GetNumRows(); ++i)
{
SkillLineEntry const* skillInfo = sSkillLineStore.LookupEntry(i);
@@ -485,7 +481,7 @@ public:
if (!spellId)
return false;
char const* allStr = strtok(NULL, " ");
char const* allStr = strtok(nullptr, " ");
bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false;
Player* target = handler->getSelectedPlayer();