sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Misc): remove the ternary operator when used improperly (#3327)

Browse Source
This commit is contained in:
Stefano Borzì
2020-09-10 12:29:23 +02:00
committed by GitHub
parent 207512a0f5
commit 51330f54d8
19 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Database/Field.h
+1 -1
View File
@@ -21,7 +21,7 @@ class Field
bool GetBool() const // Wrapper, actually gets integer
{
return GetUInt8() == 1 ? true : false;
return (GetUInt8() == 1);
}
uint8 GetUInt8() const
src/common/Packets/ByteBuffer.h
+1 -1
View File
@@ -177,7 +177,7 @@ class ByteBuffer
ByteBuffer &operator>>(bool &value)
{
value = read<char>() > 0 ? true : false;
value = (read<char>() > 0);
return *this;
}
src/server/game/AI/SmartScripts/SmartScript.cpp
+3 -3
View File
@@ -853,7 +853,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
// Activate
// xinef: wtf is this shit?
(*itr)->ToGameObject()->SetLootState(GO_READY);
(*itr)->ToGameObject()->UseDoorOrButton(0, e.action.activateObject.alternative ? true : false, unit);
(*itr)->ToGameObject()->UseDoorOrButton(0, !!e.action.activateObject.alternative, unit);
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ACTIVATE_GOBJECT. Gameobject %u (entry: %u) activated",
(*itr)->GetGUIDLow(), (*itr)->GetEntry());
@@ -1507,7 +1507,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
if (IsUnit(*itr))
(*itr)->ToUnit()->SetVisible(e.action.visibility.state ? true : false);
(*itr)->ToUnit()->SetVisible(!!e.action.visibility.state);
delete targets;
break;
@@ -1519,7 +1519,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break;
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
(*itr)->setActive(e.action.setActive.state ? true : false);
(*itr)->setActive(!!e.action.setActive.state);
delete targets;
break;
src/server/game/Accounts/AccountMgr.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ namespace AccountMgr
stmt->setString(1, CalculateShaPassHash(username, password));
PreparedQueryResult result = LoginDatabase.Query(stmt);
return (result) ? true : false;
return !!result;
}
uint32 GetCharactersCount(uint32 accountId)
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+1 -1
View File
@@ -443,7 +443,7 @@ void AuctionHouseObject::AddAuction(AuctionEntry* auction)
bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction)
{
bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false;
bool wasInMap = !!AuctionsMap.erase(auction->Id);
sScriptMgr->OnAuctionRemove(this, auction);
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+1 -1
View File
@@ -381,7 +381,7 @@ void BattlegroundIC::FillInitialWorldStates(WorldPacket& data)
for (uint8 i = 0; i < MAX_FORTRESS_GATES_SPAWNS; ++i)
{
uint32 uws = GetWorldStateFromGateEntry(BG_IC_ObjSpawnlocs[i].entry, (GateStatus[GetGateIDFromEntry(BG_IC_ObjSpawnlocs[i].entry)] == BG_IC_GATE_DESTROYED ? true : false));
uint32 uws = GetWorldStateFromGateEntry(BG_IC_ObjSpawnlocs[i].entry, (GateStatus[GetGateIDFromEntry(BG_IC_ObjSpawnlocs[i].entry)] == BG_IC_GATE_DESTROYED));
data << uint32(uws) << uint32(1);
}
src/server/game/Conditions/ConditionMgr.cpp
+3 -3
View File
@@ -49,7 +49,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
{
// don't allow 0 items (it's checked during table load)
ASSERT(ConditionValue2);
bool checkBank = ConditionValue3 ? true : false;
bool checkBank = !!ConditionValue3;
condMeets = player->HasItemCount(ConditionValue1, ConditionValue2, checkBank);
}
break;
@@ -207,12 +207,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
}
case CONDITION_NEAR_CREATURE:
{
condMeets = GetClosestCreatureWithEntry(object, ConditionValue1, (float)ConditionValue2, !ConditionValue3) ? true : false;
condMeets = !!GetClosestCreatureWithEntry(object, ConditionValue1, (float)ConditionValue2, !ConditionValue3);
break;
}
case CONDITION_NEAR_GAMEOBJECT:
{
condMeets = GetClosestGameObjectWithEntry(object, ConditionValue1, (float)ConditionValue2) ? true : false;
condMeets = !!GetClosestGameObjectWithEntry(object, ConditionValue1, (float)ConditionValue2);
break;
}
case CONDITION_OBJECT_ENTRY_GUID:
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -22585,13 +22585,13 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
switch (Condition->Comparator[i])
{
case 2: // requires less <color> than (<value> || <comparecolor>) gems
activate &= (_cur_gem < _cmp_gem) ? true : false;
activate &= (_cur_gem < _cmp_gem);
break;
case 3: // requires more <color> than (<value> || <comparecolor>) gems
activate &= (_cur_gem > _cmp_gem) ? true : false;
activate &= (_cur_gem > _cmp_gem);
break;
case 5: // requires at least <color> than (<value> || <comparecolor>) gems
activate &= (_cur_gem >= _cmp_gem) ? true : false;
activate &= (_cur_gem >= _cmp_gem);
break;
}
}
src/server/game/Entities/Player/Player.h
+2 -2
View File
@@ -1704,7 +1704,7 @@ class Player : public Unit, public GridObject<Player>
bool RemoveMItem(uint32 id)
{
return mMitems.erase(id) ? true : false;
return !!mMitems.erase(id);
}
void PetSpellInitialize();
@@ -2539,7 +2539,7 @@ class Player : public Unit, public GridObject<Player>
void SetLastUsedRune(RuneType type) { m_runes->lastUsedRune = type; }
void SetBaseRune(uint8 index, RuneType baseRune) { m_runes->runes[index].BaseRune = baseRune; }
void SetCurrentRune(uint8 index, RuneType currentRune) { m_runes->runes[index].CurrentRune = currentRune; }
void SetRuneCooldown(uint8 index, uint32 cooldown) { m_runes->runes[index].Cooldown = cooldown; m_runes->SetRuneState(index, (cooldown == 0) ? true : false); }
void SetRuneCooldown(uint8 index, uint32 cooldown) { m_runes->runes[index].Cooldown = cooldown; m_runes->SetRuneState(index, (cooldown == 0)); }
void SetGracePeriod(uint8 index, uint32 period) { m_runes->runes[index].GracePeriod = period; }
void SetRuneConvertAura(uint8 index, AuraEffect const* aura) { m_runes->runes[index].ConvertAura = aura; }
void AddRuneByAuraEffect(uint8 index, RuneType newType, AuraEffect const* aura) { SetRuneConvertAura(index, aura); ConvertRune(index, newType); }
src/server/game/Instances/InstanceScript.cpp
+3 -3
View File
@@ -121,13 +121,13 @@ void InstanceScript::UpdateDoorState(GameObject* door)
switch (info.type)
{
case DOOR_TYPE_ROOM:
open &= (info.bossInfo->state != IN_PROGRESS) ? true : false;
open &= (info.bossInfo->state != IN_PROGRESS);
break;
case DOOR_TYPE_PASSAGE:
open &= (info.bossInfo->state == DONE) ? true : false;
open &= (info.bossInfo->state == DONE);
break;
case DOOR_TYPE_SPAWN_HOLE:
open &= (info.bossInfo->state == IN_PROGRESS) ? true : false;
open &= (info.bossInfo->state == IN_PROGRESS);
break;
default:
break;
src/server/game/Maps/MapManager.cpp
+1 -1
View File
@@ -318,7 +318,7 @@ bool MapManager::IsValidMAP(uint32 mapid, bool startUp)
MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
if (startUp)
return mEntry ? true : false;
return !!mEntry;
else
return mEntry && (!mEntry->IsDungeon() || sObjectMgr->GetInstanceTemplate(mapid));
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+1 -1
View File
@@ -556,7 +556,7 @@ struct boss_jormungarAI : public ScriptedAI
break;
case EVENT_SUBMERGE:
{
bIsStationary = me->GetDisplayId() == _MODEL_STATIONARY ? true : false;
bIsStationary = (me->GetDisplayId() == _MODEL_STATIONARY);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->CastSpell(me, SPELL_SUBMERGE_0, false);
Talk(EMOTE_SUBMERGE);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+2 -2
View File
@@ -1647,8 +1647,8 @@ public:
uint32 data1 = 0, data2 = 0, data3 = 0;
loadStream >> data1 >> data2 >> data3;
AttemptsLeft = data1;
bDedicatedInsanity = data2 ? true : false;
bNooneDied = data3 ? true : false;
bDedicatedInsanity = !!data2;
bNooneDied = !!data3;
}
}
else
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+3 -3
View File
@@ -812,7 +812,7 @@ public:
for (uint8 i=0; i<num_to_activate; ++i)
{
uint32 entry = chosenComposition[WaveNumber][i];
bool forward = urand(0,1) ? true : false;
bool forward = !!urand(0,1);
for (int8 j = (forward ? 0 : NUM_OF_TRASH-1); (forward ? j<NUM_OF_TRASH : j>=0); (forward ? ++j : --j))
if (!TrashActive[j])
if (Creature* c = instance->GetCreature(NPC_TrashGUID[j]))
@@ -892,7 +892,7 @@ public:
for (uint8 i=0; i<num_to_activate; ++i)
{
uint32 entry = chosenComposition[WaveNumber-(WaveNumber > 5 ? 2 : 1)][i];
bool forward = urand(0,1) ? true : false;
bool forward = !!urand(0,1);
for (int8 j = (forward ? 0 : NUM_OF_TRASH-1); (forward ? j<NUM_OF_TRASH : j>=0); (forward ? ++j : --j))
if (!TrashActive[j])
if (Creature* c = instance->GetCreature(NPC_TrashGUID[j]))
@@ -978,7 +978,7 @@ public:
}
else if (!ResumeFirstEventTimer)
{
bool allInRangeAndAlive = (instance->GetPlayersCountExceptGMs() > 0 ? true : false);
bool allInRangeAndAlive = (instance->GetPlayersCountExceptGMs() > 0);
for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
if (Player* p = itr->GetSource())
if (!p->IsGameMaster() && (p->GetExactDist2d(&CenterPos) > MAX_DIST_FROM_CENTER_TO_START || !p->IsAlive()))
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+7 -7
View File
@@ -1228,7 +1228,7 @@ class instance_icecrown_citadel : public InstanceMapScript
switch (type)
{
case DATA_BUFF_AVAILABLE:
IsBuffAvailable = (data ? true : false);
IsBuffAvailable = !!data;
if (!IsBuffAvailable)
{
Map::PlayerList const& plrList = instance->GetPlayers();
@@ -1310,16 +1310,16 @@ class instance_icecrown_citadel : public InstanceMapScript
}
return;
case DATA_BONED_ACHIEVEMENT:
IsBonedEligible = data ? true : false;
IsBonedEligible = !!data;
break;
case DATA_OOZE_DANCE_ACHIEVEMENT:
IsOozeDanceEligible = data ? true : false;
IsOozeDanceEligible = !!data;
break;
case DATA_NAUSEA_ACHIEVEMENT:
IsNauseaEligible = data ? true : false;
IsNauseaEligible = !!data;
break;
case DATA_ORB_WHISPERER_ACHIEVEMENT:
IsOrbWhispererEligible = data ? true : false;
IsOrbWhispererEligible = !!data;
break;
case DATA_SINDRAGOSA_FROSTWYRMS:
FrostwyrmGUIDs.insert(data);
@@ -1628,10 +1628,10 @@ class instance_icecrown_citadel : public InstanceMapScript
loadStream >> WeeklyQuestId10;
loadStream >> PutricideEventProgress; PutricideEventProgress &= ~PUTRICIDE_EVENT_FLAG_TRAP_INPROGRESS;
loadStream >> temp;
LichKingHeroicAvailable = temp ? true : false;
LichKingHeroicAvailable = !!temp;
loadStream >> BloodPrinceTrashCount;
loadStream >> temp;
SetData(DATA_BUFF_AVAILABLE, temp ? true : false);
SetData(DATA_BUFF_AVAILABLE, !!temp);
}
else
OUT_LOAD_INST_DATA_FAIL;
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+3 -3
View File
@@ -170,13 +170,13 @@ public:
}
break;
case DATA_AMBER_VOID:
bAmberVoid = data ? true : false;
bAmberVoid = !!data;
break;
case DATA_EMERALD_VOID:
bEmeraldVoid = data ? true : false;
bEmeraldVoid = !!data;
break;
case DATA_RUBY_VOID:
bRubyVoid = data ? true : false;
bRubyVoid = !!data;
break;
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+1 -1
View File
@@ -555,7 +555,7 @@ class achievement_ignis_shattered : public AchievementCriteriaScript
{
if (!target || target->GetTypeId() != TYPEID_UNIT)
return false;
return (target->ToCreature()->AI()->GetData(1337) ? true : false);
return !!target->ToCreature()->AI()->GetData(1337);
}
};
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+1 -1
View File
@@ -380,7 +380,7 @@ public:
}
bool on = (GetData(type) == DONE && !(GetData(TYPE_WATCHERS) & (1 << (type-TYPE_FREYA))));
cr->SetVisible(on ? true : false);
cr->SetVisible(on);
}
void OnGameObjectCreate(GameObject* gameObject)
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+1 -1
View File
@@ -275,7 +275,7 @@ public:
InstanceCleanup();
break;
case DATA_ACHIEV:
bAchiev = data ? true : false;
bAchiev = !!data;
break;
}
}