diff options
| -rw-r--r-- | src/game/AchievementMgr.h | 2 | ||||
| -rw-r--r-- | src/game/InstanceData.h | 8 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index cbca0a0caf2..947bfb00305 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -60,7 +60,7 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK = 15,// drunken_state 0 (enum DrunkenState) of player ACHIEVEMENT_CRITERIA_DATA_TYPE_HOLIDAY = 16,// holiday_id 0 event in holiday time ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE = 17,// min_score max_score player's team win bg and opposition team have team score in range - ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT = 18,// 0 0 maker instance script call for check curent criteria requirements fit + ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT = 18,// 0 0 maker instance script call for check curent criteria requirements fit }; #define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 19 // maximum value in AchievementCriteriaDataType enum diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 61a7ee7fffe..b9aa6abbe02 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -164,6 +164,10 @@ class TRINITY_DLL_SPEC InstanceData : public ZoneScript virtual bool SetBossState(uint32 id, EncounterState state); EncounterState GetBossState(uint32 id) const { return id < bosses.size() ? bosses[id].state : TO_BE_DECIDED; } const BossBoundaryMap * GetBossBoundary(uint32 id) const { return id < bosses.size() ? &bosses[id].boundary : NULL; } + + // Achievement criteria additional requirements check + // NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType + virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0); protected: void SetBossNumber(uint32 number) { bosses.resize(number); } void LoadDoorData(const DoorData *data); @@ -181,10 +185,6 @@ class TRINITY_DLL_SPEC InstanceData : public ZoneScript std::vector<BossInfo> bosses; DoorInfoMap doors; MinionInfoMap minions; - - // Achievement criteria additional requirements check - // NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType - virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0); }; #endif diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 527a4726bdc..1ea261c57e0 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -700,7 +700,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) case SPELLFAMILY_PALADIN: { // Hammer of the Righteous - else if (m_spellInfo->SpellFamilyFlags[1]&0x00040000) + if (m_spellInfo->SpellFamilyFlags[1]&0x00040000) { // Add main hand dps * effect[2] amount float average = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2; |