server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109 from zwisus/develop21

Browse Source 
Typo and  Take Power.
This commit is contained in:
Antz 2016-03-29 09:34:40 +01:00
commit 6eb3ee5334
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Object/Player.cpp
View File

@ -16946,7 +16946,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> 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();

16
src/game/WorldHandlers/Spell.cpp
View File

@ -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<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
if (ihit->targetGUID = targetGUID)
if (powerType == POWER_ENERGY || powerType == POWER_RAGE)
for (std::list<TargetInfo>::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;
}
}
}
}

2
src/game/WorldHandlers/World.cpp
View File

@ -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);

2
src/game/WorldHandlers/World.h
View File

@ -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,