nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 10:55:43 +00:00
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

60
src/scripts/Commands/cs_npc.cpp
View File

@@ -74,20 +74,17 @@ public:
//{ TODO: fix or remove this command
{ "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "" },
//}
{ "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "" }
};
static std::vector<ChatCommand> npcDeleteCommandTable =
{
{ "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "" },
{ "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "" }
};
static std::vector<ChatCommand> npcFollowCommandTable =
{
{ "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "" },
{ "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "" },
{ NULL, 0, false, NULL, "" }
{ "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "" }
};
static std::vector<ChatCommand> npcSetCommandTable =
{
@@ -105,9 +102,8 @@ public:
{ "data", SEC_ADMINISTRATOR, false, &HandleNpcSetDataCommand, "" },
//{ TODO: fix or remove these commands
{ "name", SEC_GAMEMASTER, false, &HandleNpcSetNameCommand, "" },
{ "subname", SEC_GAMEMASTER, false, &HandleNpcSetSubNameCommand, "" },
{ "subname", SEC_GAMEMASTER, false, &HandleNpcSetSubNameCommand, "" }
//}
{ NULL, 0, false, NULL, "" }
};
static std::vector<ChatCommand> npcCommandTable =
{
@@ -120,16 +116,14 @@ public:
{ "whisper", SEC_GAMEMASTER, false, &HandleNpcWhisperCommand, "" },
{ "yell", SEC_GAMEMASTER, false, &HandleNpcYellCommand, "" },
{ "tame", SEC_GAMEMASTER, false, &HandleNpcTameCommand, "" },
{ "add", SEC_GAMEMASTER, false, NULL, "", npcAddCommandTable },
{ "delete", SEC_GAMEMASTER, false, NULL, "", npcDeleteCommandTable },
{ "follow", SEC_GAMEMASTER, false, NULL, "", npcFollowCommandTable },
{ "set", SEC_GAMEMASTER, false, NULL, "", npcSetCommandTable },
{ NULL, 0, false, NULL, "" }
{ "add", SEC_GAMEMASTER, false, nullptr, "", npcAddCommandTable },
{ "delete", SEC_GAMEMASTER, false, nullptr, "", npcDeleteCommandTable },
{ "follow", SEC_GAMEMASTER, false, nullptr, "", npcFollowCommandTable },
{ "set", SEC_GAMEMASTER, false, nullptr, "", npcSetCommandTable }
};
static std::vector<ChatCommand> commandTable =
{
{ "npc", SEC_GAMEMASTER, false, NULL, "", npcCommandTable },
{ NULL, 0, false, NULL, "" }
{ "npc", SEC_GAMEMASTER, false, nullptr, "", npcCommandTable }
};
return commandTable;
}
@@ -144,7 +138,7 @@ public:
if (!charID)
return false;
char* team = strtok(NULL, " ");
char* team = strtok(nullptr, " ");
int32 teamval = 0;
if (team)
teamval = atoi(team);
@@ -229,17 +223,17 @@ public:
uint32 itemId = item_int;
char* fmaxcount = strtok(NULL, " "); //add maxcount, default: 0
char* fmaxcount = strtok(nullptr, " "); //add maxcount, default: 0
uint32 maxcount = 0;
if (fmaxcount)
maxcount = atol(fmaxcount);
char* fincrtime = strtok(NULL, " "); //add incrtime, default: 0
char* fincrtime = strtok(nullptr, " "); //add incrtime, default: 0
uint32 incrtime = 0;
if (fincrtime)
incrtime = atol(fincrtime);
char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0
char* fextendedcost = strtok(nullptr, " "); //add ExtendedCost, default: 0
uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
Creature* vendor = handler->getSelectedCreature();
if (!vendor)
@@ -272,11 +266,11 @@ public:
return false;
char* guidStr = strtok((char*)args, " ");
char* waitStr = strtok((char*)NULL, " ");
char* waitStr = strtok((char*)nullptr, " ");
uint32 lowGuid = atoi((char*)guidStr);
Creature* creature = NULL;
Creature* creature = nullptr;
/* FIXME: impossible without entry
if (lowguid)
@@ -413,7 +407,7 @@ public:
static bool HandleNpcDeleteCommand(ChatHandler* handler, const char* args)
{
Creature* unit = NULL;
Creature* unit = nullptr;
if (*args)
{
@@ -568,7 +562,7 @@ public:
return false;
char* arg1 = strtok((char*)args, " ");
char* arg2 = strtok((char*)NULL, "");
char* arg2 = strtok((char*)nullptr, "");
if (!arg1 || !arg2)
return false;
@@ -632,7 +626,7 @@ public:
uint32 Entry = target->GetEntry();
CreatureTemplate const* cInfo = target->GetCreatureTemplate();
int64 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
int64 curRespawnDelay = target->GetRespawnTimeEx()-time(nullptr);
if (curRespawnDelay < 0)
curRespawnDelay = 0;
std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), true);
@@ -860,8 +854,8 @@ public:
// later switched on/off according to special events (like escort
// quests, etc)
char* guid_str = strtok((char*)args, " ");
char* type_str = strtok((char*)NULL, " ");
char* dontdel_str = strtok((char*)NULL, " ");
char* type_str = strtok((char*)nullptr, " ");
char* dontdel_str = strtok((char*)nullptr, " ");
bool doNotDelete = false;
@@ -869,7 +863,7 @@ public:
return false;
uint32 lowguid = 0;
Creature* creature = NULL;
Creature* creature = nullptr;
if (dontdel_str)
{
@@ -895,7 +889,7 @@ public:
{
//sLog->outError("DEBUG: type_str, NODEL ");
doNotDelete = true;
type_str = NULL;
type_str = nullptr;
}
}
}
@@ -935,7 +929,7 @@ public:
}
// now lowguid is low guid really existed creature
// and creature point (maybe) to this creature or NULL
// and creature point (maybe) to this creature or nullptr
MovementGeneratorType move_type;
@@ -1112,7 +1106,7 @@ public:
return false;
}
creature->MonsterSay(args, LANG_UNIVERSAL, NULL);
creature->MonsterSay(args, LANG_UNIVERSAL, nullptr);
// make some emotes
char lastchar = args[strlen(args) - 1];
@@ -1190,7 +1184,7 @@ public:
return false;
char* receiver_str = strtok((char*)args, " ");
char* text = strtok(NULL, "");
char* text = strtok(nullptr, "");
Creature* creature = handler->getSelectedCreature();
if (!creature || !receiver_str || !text)
@@ -1220,7 +1214,7 @@ public:
return false;
}
creature->MonsterYell(args, LANG_UNIVERSAL, NULL);
creature->MonsterYell(args, LANG_UNIVERSAL, nullptr);
// make an emote
creature->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT);
@@ -1427,7 +1421,7 @@ public:
if (!pSlotID)
return false;
char* pItemID = strtok(NULL, " ");
char* pItemID = strtok(nullptr, " ");
if (!pItemID)
return false;