aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-05-07 18:52:34 +0200
committerShauren <shauren.trinity@gmail.com>2023-05-07 18:52:34 +0200
commitaa96aa478382524f75796ef8738cb0e0c8236981 (patch)
treeb2c1585cc0f0c7eef0f485dd3c4bbfa3a120f79b
parent7e0b28c70c5dc8e43d277fe00b54db9fe2d9805f (diff)
Core/Misc: Cleanup Expression is converted to bool and can be replaced with 'boolean constant'
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Guilds/Guild.cpp2
-rw-r--r--src/server/game/Loot/Loot.cpp8
-rw-r--r--src/server/game/Maps/MapUpdater.cpp2
-rw-r--r--src/server/game/Movement/PathGenerator.cpp2
-rw-r--r--src/server/game/Spells/SpellMgr.cpp5
-rw-r--r--src/server/game/World/World.cpp2
-rw-r--r--src/server/scripts/Outland/boss_doomwalker.cpp3
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp4
9 files changed, 13 insertions, 17 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 46af30991fc..c3d840dd633 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -715,7 +715,7 @@ void Player::SendMirrorTimer(MirrorTimerType Type, uint32 MaxValue, uint32 Curre
return;
}
- SendDirectMessage(WorldPackets::Misc::StartMirrorTimer(Type, CurrentValue, MaxValue, Regen, 0, 0).Write());
+ SendDirectMessage(WorldPackets::Misc::StartMirrorTimer(Type, CurrentValue, MaxValue, Regen, false, 0).Write());
}
void Player::StopMirrorTimer(MirrorTimerType Type)
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index b71fe0f30a8..f7b26e1caca 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -2120,7 +2120,7 @@ bool Guild::Validate()
_SetLeaderGUID(*pLeader);
// Check config if multiple guildmasters are allowed
- if (!sConfigMgr->GetBoolDefault("Guild.AllowMultipleGuildMaster", 0))
+ if (!sConfigMgr->GetBoolDefault("Guild.AllowMultipleGuildMaster", false))
for (auto& [guid, member] : m_members)
if ((member.GetRankId() == GR_GUILDMASTER) && !member.IsSamePlayer(m_leaderGuid))
member.ChangeRank(trans, GR_OFFICER);
diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp
index e08da5a251a..3f251d8d9f5 100644
--- a/src/server/game/Loot/Loot.cpp
+++ b/src/server/game/Loot/Loot.cpp
@@ -47,10 +47,10 @@ LootItem::LootItem(LootStoreItem const& li)
randomSuffix = GenerateEnchSuffixFactor(itemid);
randomPropertyId = GenerateItemRandomPropertyId(itemid);
count = 0;
- is_looted = 0;
- is_blocked = 0;
- is_underthreshold = 0;
- is_counted = 0;
+ is_looted = false;
+ is_blocked = false;
+ is_underthreshold = false;
+ is_counted = false;
rollWinnerGUID = ObjectGuid::Empty;
}
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index baa26669b59..e673e5b1420 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -106,7 +106,7 @@ void MapUpdater::WorkerThread()
CharacterDatabase.WarnAboutSyncQueries(true);
WorldDatabase.WarnAboutSyncQueries(true);
- while (1)
+ while (true)
{
MapUpdateRequest* request = nullptr;
diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index 84c29b30736..d1b280083d4 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -991,7 +991,7 @@ void PathGenerator::ShortenPathUntilDist(G3D::Vector3 const& target, float dist)
// - _pathPoints[i] is still too close
// - _pathPoints[i-1] is too far away
// => the end point is somewhere on the line between the two
- while (1)
+ while (true)
{
// we know that pathPoints[i] is too close already (from the previous iteration)
if ((_pathPoints[i-1] - target).squaredLength() >= distSq)
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index ebcab322106..8151bceef4c 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2042,10 +2042,7 @@ void SpellMgr::LoadEnchantCustomAttr()
uint32 oldMSTime = getMSTime();
uint32 size = sSpellItemEnchantmentStore.GetNumRows();
- mEnchantCustomAttr.resize(size);
-
- for (uint32 i = 0; i < size; ++i)
- mEnchantCustomAttr[i] = 0;
+ mEnchantCustomAttr.resize(size, false);
uint32 count = 0;
for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i)
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 95318635c0e..dcbf09fddc7 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1399,7 +1399,7 @@ void World::LoadConfigSettings(bool reload)
m_bool_configs[CONFIG_ENABLE_MMAPS] = sConfigMgr->GetBoolDefault("mmap.enablePathFinding", true);
TC_LOG_INFO("server.loading", "WORLD: MMap data directory is: %smmaps", m_dataPath.c_str());
- m_bool_configs[CONFIG_VMAP_INDOOR_CHECK] = sConfigMgr->GetBoolDefault("vmap.enableIndoorCheck", 0);
+ m_bool_configs[CONFIG_VMAP_INDOOR_CHECK] = sConfigMgr->GetBoolDefault("vmap.enableIndoorCheck", false);
bool enableIndoor = sConfigMgr->GetBoolDefault("vmap.enableIndoorCheck", true);
bool enableLOS = sConfigMgr->GetBoolDefault("vmap.enableLOS", true);
bool enableHeight = sConfigMgr->GetBoolDefault("vmap.enableHeight", true);
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index f9b48263ba7..f44d58db979 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -91,11 +91,10 @@ struct boss_doomwalker : public ScriptedAI
}
void MoveInLineOfSight(Unit* who) override
-
{
if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who))
if (who->HasAura(SPELL_MARK_DEATH))
- who->CastSpell(who, SPELL_AURA_DEATH, 1);
+ who->CastSpell(who, SPELL_AURA_DEATH, true);
}
void UpdateAI(uint32 diff) override
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 4db988026c3..274ea10bca6 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -214,7 +214,7 @@ namespace MMAP
void TileBuilder::WorkerThread()
{
- while (1)
+ while (true)
{
TileInfo tileInfo;
@@ -922,7 +922,7 @@ namespace MMAP
// now that tile is written to disk, we can unload it
navMesh->removeTile(tileRef, nullptr, nullptr);
}
- while (0);
+ while (false);
if (m_debugOutput)
{