Core/Common: Tokenizer -> Trinity::Tokenize
This commit is contained in:
1 parent
95329dc15c
commit
f95a8bfdca
32 files changed
+414
-354
No files matched your search
@@ -33,6 +33,7 @@ EndScriptData */
|
||||
#include "Player.h"
|
||||
#include "RBAC.h"
|
||||
#include "ReputationMgr.h"
|
||||
#include "StringConvert.h"
|
||||
#include "WorldSession.h"
|
||||
|
||||
class modify_commandscript : public CommandScript
|
||||
@@ -558,11 +559,16 @@ public:
|
||||
if (handler->HasLowerSecurity(target, ObjectGuid::Empty))
|
||||
return false;
|
||||
|
||||
int64 moneyToAdd = 0;
|
||||
Optional<int64> moneyToAddO = 0;
|
||||
if (strchr(args, 'g') || strchr(args, 's') || strchr(args, 'c'))
|
||||
moneyToAdd = MoneyStringToMoney(std::string(args));
|
||||
moneyToAddO = MoneyStringToMoney(std::string(args));
|
||||
else
|
||||
moneyToAdd = atol(args);
|
||||
moneyToAddO = Trinity::StringTo<int64>(args);
|
||||
|
||||
if (!moneyToAddO)
|
||||
return false;
|
||||
|
||||
int64 moneyToAdd = *moneyToAddO;
|
||||
|
||||
uint64 targetMoney = target->GetMoney();
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@ EndScriptData */
|
||||
#include "SkillExtraItems.h"
|
||||
#include "SmartAI.h"
|
||||
#include "SpellMgr.h"
|
||||
#include "StringConvert.h"
|
||||
#include "TicketMgr.h"
|
||||
#include "WardenCheckMgr.h"
|
||||
#include "WaypointManager.h"
|
||||
@@ -196,7 +197,7 @@ public:
|
||||
HandleReloadGameTeleCommand(handler, "");
|
||||
|
||||
HandleReloadCreatureMovementOverrideCommand(handler, "");
|
||||
HandleReloadCreatureSummonGroupsCommand(handler, "");
|
||||
HandleReloadCreatureSummonGroupsCommand(handler);
|
||||
|
||||
HandleReloadVehicleAccessoryCommand(handler, "");
|
||||
HandleReloadVehicleTemplateAccessoryCommand(handler, "");
|
||||
@@ -408,7 +409,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool HandleReloadCreatureSummonGroupsCommand(ChatHandler* handler, char const* /*args*/)
|
||||
static bool HandleReloadCreatureSummonGroupsCommand(ChatHandler* handler)
|
||||
{
|
||||
TC_LOG_INFO("misc", "Reloading creature summon groups...");
|
||||
sObjectMgr->LoadTempSummons();
|
||||
@@ -421,11 +422,9 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
Tokenizer entries(std::string(args), ' ');
|
||||
|
||||
for (Tokenizer::const_iterator itr = entries.begin(); itr != entries.end(); ++itr)
|
||||
for (std::string_view entryStr : Trinity::Tokenize(args, ' ', false))
|
||||
{
|
||||
uint32 entry = uint32(atoi(*itr));
|
||||
uint32 entry = Trinity::StringTo<uint32>(entryStr).value_or(0);
|
||||
|
||||
WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_CREATURE_TEMPLATE);
|
||||
stmt->setUInt32(0, entry);
|
||||
|
||||
Reference in new issue
Block a user