aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2012-12-17 05:39:04 +0100
committerclick <click@gonnamakeyou.com>2012-12-17 05:39:04 +0100
commitaa3980c744fcb102e18319f21305576ccb0da5c9 (patch)
treeeded863bdcc11a7194fffa476dc8e2a71a1439df /src/server/game
parent1f88f81c5a8da1ce7e1f4c52223884f88d9945af (diff)
Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/AI/CoreAI/PetAI.cpp2
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 9b0123ed824..6f7338e0e6f 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -183,7 +183,7 @@ void PetAI::UpdateAI(const uint32 diff)
}
}
if (spellInfo->HasEffect(SPELL_EFFECT_JUMP_DEST))
- continue; //pets must jump only to target
+ continue; //pets must jump only to target
// No enemy, check friendly
if (!spellUsed)
{
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index b28295d47ef..8d39e459187 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -413,11 +413,11 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData* data)
// updates spell bars for vehicles and set player's faction - should be called here, to overwrite faction that is set from the new template
if (IsVehicle())
- {
+ {
if (Player* owner = Creature::GetCharmerOrOwnerPlayerOrPlayerItself()) // this check comes in case we don't have a player
- {
+ {
setFaction(owner->getFaction()); // vehicles should have same as owner faction
- owner->VehicleSpellInitialize();
+ owner->VehicleSpellInitialize();
}
}