nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 22:26:22 +00:00
Code Issues 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

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
View File

@@ -209,7 +209,7 @@ public:
counter = 0;
bShattered = false;
lastShatterMSTime = 0;
if( InstanceScript* m_pInstance = me->GetInstanceScript() )
{
m_pInstance->SetData(TYPE_IGNIS, NOT_STARTED);
@@ -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);
}
};
@@ -567,4 +567,4 @@ void AddSC_boss_ignis()
new spell_ignis_grab_initial();
new spell_ignis_slag_pot();
new achievement_ignis_shattered();
}
}

16
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -91,15 +91,15 @@ public:
uint64 m_algalonTrapdoorGUID;
uint64 m_brannBronzebeardAlgGUID;
uint32 m_algalonTimer;
// Shared
EventMap _events;
bool m_mimironTramUsed;
uint64 m_mimironTramGUID;
uint64 m_keepersgateGUID;
uint64 m_keepersGossipGUID[4];
void Initialize()
{
// Bosses
@@ -165,7 +165,7 @@ public:
m_algalonTrapdoorGUID = 0;
m_brannBronzebeardAlgGUID = 0;
m_algalonTimer = 0;
// Shared
_events.Reset();
memset(&m_keepersGossipGUID, 0, sizeof(m_keepersGossipGUID));
@@ -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)
@@ -710,7 +710,7 @@ public:
freya->GetGameObjectListWithEntryInGrid(goList, 190171 /*Lichbloom*/, 333.0f);
freya->GetGameObjectListWithEntryInGrid(goList, 190170 /*Talandra's Rose*/, 333.0f);
freya->GetGameObjectListWithEntryInGrid(goList, 189973 /*Goldclover*/, 333.0f);
for (std::list<GameObject*>::const_iterator itr = goList.begin(); itr != goList.end(); ++itr)
(*itr)->SetRespawnTime(7*DAY);
}
@@ -961,7 +961,7 @@ public:
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
{
loadStream >> m_auiEncounter[i];
if (m_auiEncounter[i] == IN_PROGRESS && i != TYPE_WATCHERS)
m_auiEncounter[i] = NOT_STARTED;
}
@@ -1070,7 +1070,7 @@ public:
};
};
const Position vehiclePositions[30] =
const Position vehiclePositions[30] =
{
// Start Positions
// Siege