Core/Misc: correct some include orders and comments
This commit is contained in:
1 parent
af40c9404b
commit
a207839337
2 files changed
+12
-13
No files matched your search
@@ -18,12 +18,6 @@
|
||||
#ifndef __UNIT_H
|
||||
#define __UNIT_H
|
||||
|
||||
#include <array>
|
||||
#include <forward_list>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <stack>
|
||||
|
||||
#include "CombatManager.h"
|
||||
#include "Object.h"
|
||||
#include "SpellAuraDefines.h"
|
||||
@@ -34,6 +28,12 @@
|
||||
#include "UnitDefines.h"
|
||||
#include "Util.h"
|
||||
|
||||
#include <array>
|
||||
#include <forward_list>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <stack>
|
||||
|
||||
constexpr uint32 WORLD_TRIGGER = 12999;
|
||||
|
||||
constexpr uint8 MAX_SPELL_CHARM = 4;
|
||||
|
||||
@@ -16,11 +16,6 @@
|
||||
*/
|
||||
|
||||
#include "SpellAuraEffects.h"
|
||||
|
||||
#include <G3D/g3dmath.h>
|
||||
|
||||
#include <numeric>
|
||||
|
||||
#include "Battlefield.h"
|
||||
#include "BattlefieldMgr.h"
|
||||
#include "Battleground.h"
|
||||
@@ -54,6 +49,9 @@
|
||||
#include "Weather.h"
|
||||
#include "WorldPacket.h"
|
||||
|
||||
#include <G3D/g3dmath.h>
|
||||
#include <numeric>
|
||||
|
||||
class Aura;
|
||||
//
|
||||
// EFFECT HANDLER NOTES
|
||||
@@ -3586,10 +3584,11 @@ void AuraEffect::HandleModPercentStat(AuraApplication const* aurApp, uint8 mode,
|
||||
{
|
||||
if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
|
||||
return;
|
||||
|
||||
StatType stat = static_cast<StatType>(GetMiscValue());
|
||||
if (stat < StatType::PrimaryStat || stat >= StatType::Max)
|
||||
{
|
||||
TC_LOG_ERROR("spells", "WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_STAT ", GetId(), GetEffIndex(), GetMiscValue());
|
||||
TC_LOG_ERROR("spells", "WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_PERCENT_STAT ", GetId(), GetEffIndex(), GetMiscValue());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3679,7 +3678,7 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const* aurApp, uint8
|
||||
StatType stat = static_cast<StatType>(GetMiscValue());
|
||||
if (stat < StatType::PrimaryStat || stat >= StatType::Max)
|
||||
{
|
||||
TC_LOG_ERROR("spells", "WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_STAT ", GetId(), GetEffIndex(), GetMiscValue());
|
||||
TC_LOG_ERROR("spells", "WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE ", GetId(), GetEffIndex(), GetMiscValue());
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user