From a5e0d20e7ed451e2ca94df93f114dfb904260e94 Mon Sep 17 00:00:00 2001 From: zwisus Date: Tue, 29 Mar 2016 10:22:00 +0800 Subject: [PATCH] Typo and Take Power. --- src/game/Object/Player.cpp | 2 +- src/game/WorldHandlers/Spell.cpp | 16 +++++++--------- src/game/WorldHandlers/World.cpp | 2 +- src/game/WorldHandlers/World.h | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp index 1c31812d..878d138a 100644 --- a/src/game/Object/Player.cpp +++ b/src/game/Object/Player.cpp @@ -16946,7 +16946,7 @@ bool Player::ActivateTaxiPathTo(std::vector const& nodes, Creature* npc // prevent stealth flight RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - if (sWorld.getConfig(CONFIG_BOLL_INSTANT_TAXI)) + if (sWorld.getConfig(CONFIG_BOOL_INSTANT_TAXI)) { TaxiNodesEntry const* lastnode = sTaxiNodesStore.LookupEntry(nodes[nodes.size() - 1]); m_taxi.ClearTaxiDestinations(); diff --git a/src/game/WorldHandlers/Spell.cpp b/src/game/WorldHandlers/Spell.cpp index 0c461167..1a74793f 100644 --- a/src/game/WorldHandlers/Spell.cpp +++ b/src/game/WorldHandlers/Spell.cpp @@ -3804,17 +3804,15 @@ void Spell::TakePower() { if (m_caster->GetTypeId() == TYPEID_PLAYER) { - if (powerType == POWER_ENERGY) - if (uint64 targetGUID = m_targets.getUnitTargetGuid()) - for (std::list::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) - if (ihit->targetGUID = targetGUID) + if (powerType == POWER_ENERGY || powerType == POWER_RAGE) + for (std::list::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + { + if (ihit->missCondition != SPELL_MISS_NONE) { - if (ihit->missCondition != SPELL_MISS_NONE) - { - hit = false; - } - break; + hit = false; } + break; + } } } } diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index b478c24a..6cca1eeb 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -563,7 +563,7 @@ void World::LoadConfigSettings(bool reload) setConfigMinMax(CONFIG_UINT32_MAINTENANCE_DAY, "MaintenanceDay", 4, 0, 6); setConfig(CONFIG_BOOL_ALL_TAXI_PATHS, "AllFlightPaths", false); - setConfig(CONFIG_BOLL_INSTANT_TAXI, "InstantFlightPaths", false); + setConfig(CONFIG_BOOL_INSTANT_TAXI, "InstantFlightPaths", false); setConfig(CONFIG_UINT32_MOUNT_COST, "MountCost", 100000); setConfigMin(CONFIG_UINT32_MIN_TRAIN_MOUNT_LEVEL, "MinTrainMountLevel", 40, 1); diff --git a/src/game/WorldHandlers/World.h b/src/game/WorldHandlers/World.h index e974bf22..5aa3008a 100644 --- a/src/game/WorldHandlers/World.h +++ b/src/game/WorldHandlers/World.h @@ -331,7 +331,7 @@ enum eConfigBoolValues CONFIG_BOOL_DEATH_BONES_WORLD, CONFIG_BOOL_DEATH_BONES_BG, CONFIG_BOOL_ALL_TAXI_PATHS, - CONFIG_BOLL_INSTANT_TAXI, + CONFIG_BOOL_INSTANT_TAXI, CONFIG_BOOL_SKILL_FAIL_LOOT_FISHING, CONFIG_BOOL_SKILL_FAIL_GAIN_FISHING, CONFIG_BOOL_SKILL_FAIL_POSSIBLE_FISHINGPOOL,