aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/Chat.cpp10
-rw-r--r--src/game/Creature.cpp26
-rw-r--r--src/game/Creature.h4
-rw-r--r--src/game/CreatureGroups.cpp14
-rw-r--r--src/game/CreatureGroups.h48
-rw-r--r--src/game/HomeMovementGenerator.cpp2
-rw-r--r--src/game/HomeMovementGenerator.h2
-rw-r--r--src/game/Language.h42
-rw-r--r--src/game/Level2.cpp18
-rw-r--r--src/game/Makefile.am520
-rw-r--r--src/game/MotionMaster.cpp6
-rw-r--r--src/game/ObjectMgr.cpp18
-rw-r--r--src/game/Player.cpp4
-rw-r--r--src/game/Player.h2
-rw-r--r--src/game/RandomMovementGenerator.cpp6
-rw-r--r--src/game/SocialMgr.cpp2
-rw-r--r--src/game/SpellEffects.cpp12
-rw-r--r--src/game/SpellMgr.cpp2
-rw-r--r--src/game/Unit.cpp8
-rw-r--r--src/game/WaypointMovementGenerator.cpp8
-rw-r--r--src/game/World.cpp22
21 files changed, 388 insertions, 388 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 1603d7b8fdf..50bb6b7832f 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -1033,11 +1033,11 @@ int ChatHandler::ParseCommands(const char* text)
++text;
if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
- {
- if(m_session && m_session->GetSecurity() == SEC_PLAYER)
- return 0;
- SendSysMessage(LANG_NO_CMD);
- }
+ {
+ if(m_session && m_session->GetSecurity() == SEC_PLAYER)
+ return 0;
+ SendSysMessage(LANG_NO_CMD);
+ }
return 1;
}
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 837a45942ab..74ebe4406c8 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -623,14 +623,14 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
void Creature::Motion_Initialize()
{
- if(!m_formation)
- i_motionMaster.Initialize();
- else if(m_formation->getLeader() == this)
- {
- m_formation->FormationReset(false);
- i_motionMaster.Initialize();
- }
- else if(m_formation->isFormed())
+ if(!m_formation)
+ i_motionMaster.Initialize();
+ else if(m_formation->getLeader() == this)
+ {
+ m_formation->FormationReset(false);
+ i_motionMaster.Initialize();
+ }
+ else if(m_formation->isFormed())
i_motionMaster.MoveIdle(MOTION_SLOT_IDLE); //wait the order of leader
else
i_motionMaster.Initialize();
@@ -1672,10 +1672,10 @@ void Creature::setDeathState(DeathState s)
Unit::setDeathState(CORPSE);
- //Dismiss group if is leader
- if(m_formation && m_formation->getLeader() == this)
- m_formation->FormationReset(true);
- }
+ //Dismiss group if is leader
+ if(m_formation && m_formation->getLeader() == this)
+ m_formation->FormationReset(true);
+ }
if(s == JUST_ALIVED)
{
//if(isPet())
@@ -1691,7 +1691,7 @@ void Creature::setDeathState(DeathState s)
SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
LoadCreaturesAddon(true);
Motion_Initialize();
- }
+ }
}
bool Creature::FallGround()
diff --git a/src/game/Creature.h b/src/game/Creature.h
index d265225e5b7..02111ea9f70 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -652,8 +652,8 @@ class TRINITY_DLL_SPEC Creature : public Unit
void UpdateWaypointID(uint32 wpID){m_waypointID = wpID;}
void SearchFormation();
- CreatureGroup *GetFormation() {return m_formation;}
- void SetFormation(CreatureGroup *formation) {m_formation = formation;}
+ CreatureGroup *GetFormation() {return m_formation;}
+ void SetFormation(CreatureGroup *formation) {m_formation = formation;}
Unit *SelectVictim();
void SetDeadByDefault (bool death_state) {m_isDeadByDefault = death_state;}
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 65e51b793f0..63a252a9e20 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -118,15 +118,15 @@ void CreatureGroupManager::LoadCreatureFormations()
bar.step();
//Load group member data
- group_member = new FormationInfo;
- group_member->leaderGUID = fields[0].GetUInt32();
+ group_member = new FormationInfo;
+ group_member->leaderGUID = fields[0].GetUInt32();
uint32 memberGUID = fields[1].GetUInt32();
- group_member->groupAI = fields[4].GetUInt8();
+ group_member->groupAI = fields[4].GetUInt8();
//If creature is group leader we may skip loading of dist/angle
if(group_member->leaderGUID != memberGUID)
{
- group_member->follow_dist = fields[2].GetUInt32();
- group_member->follow_angle = fields[3].GetUInt32();
+ group_member->follow_dist = fields[2].GetUInt32();
+ group_member->follow_angle = fields[3].GetUInt32();
}
CreatureGroupMap[memberGUID] = group_member;
@@ -217,7 +217,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z)
if(!m_leader)
return;
- float pathangle = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
+ float pathangle = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
@@ -226,7 +226,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z)
continue;
float angle = itr->second->follow_angle;
- float dist = itr->second->follow_dist;
+ float dist = itr->second->follow_dist;
float dx = x + cos(angle + pathangle) * dist;
float dy = y + sin(angle + pathangle) * dist;
diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h
index 1f7e5d97ce3..b61258ba1ca 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -27,18 +27,18 @@ class CreatureGroup;
struct FormationInfo
{
- uint32 leaderGUID;
- float follow_dist;
- float follow_angle;
+ uint32 leaderGUID;
+ float follow_dist;
+ float follow_angle;
uint8 groupAI;
};
class CreatureGroupManager
{
- public:
+ public:
void AddCreatureToGroup(uint32 group_id, Creature *creature);
void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
- void LoadCreatureFormations();
+ void LoadCreatureFormations();
};
typedef std::multimap<uint32/*leaderDBGUID*/, CreatureGroup*> CreatureGroupHolderType;
@@ -50,30 +50,30 @@ extern CreatureGroupInfoType CreatureGroupMap;
class CreatureGroup
{
private:
- Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+ Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
typedef std::map<Creature*, FormationInfo*> CreatureGroupMemberType;
- CreatureGroupMemberType m_members;
+ CreatureGroupMemberType m_members;
- uint32 m_groupID, mInstanceID;
- bool m_Formed;
-
- public:
+ uint32 m_groupID, mInstanceID;
+ bool m_Formed;
+
+ public:
//Group cannot be created empty
- explicit CreatureGroup(uint32 id, uint32 InstanceID) : m_groupID(id), m_leader(NULL), mInstanceID(InstanceID), m_Formed(false) {}
- ~CreatureGroup(){sLog.outDebug("Destroying group");}
-
- Creature* getLeader() const { return m_leader; }
- uint32 GetId() const { return m_groupID; }
- uint32 getInstanceID() const { return mInstanceID; }
- bool isEmpty() const { return m_members.empty(); }
- bool isFormed() const { return m_Formed; }
+ explicit CreatureGroup(uint32 id, uint32 InstanceID) : m_groupID(id), m_leader(NULL), mInstanceID(InstanceID), m_Formed(false) {}
+ ~CreatureGroup(){sLog.outDebug("Destroying group");}
+
+ Creature* getLeader() const { return m_leader; }
+ uint32 GetId() const { return m_groupID; }
+ uint32 getInstanceID() const { return mInstanceID; }
+ bool isEmpty() const { return m_members.empty(); }
+ bool isFormed() const { return m_Formed; }
- void AddMember(Creature *member);
- void RemoveMember(Creature *member);
- void FormationReset(bool dismiss);
+ void AddMember(Creature *member);
+ void RemoveMember(Creature *member);
+ void FormationReset(bool dismiss);
- void LeaderMoveTo(float x, float y, float z);
- void MemberAttackStart(Creature* member, Unit *target);
+ void LeaderMoveTo(float x, float y, float z);
+ void MemberAttackStart(Creature* member, Unit *target);
};
#define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
index eee10c6fbb2..17174919b15 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/HomeMovementGenerator.cpp
@@ -70,7 +70,7 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
if(owner.GetDefaultMovementType()==IDLE_MOTION_TYPE)
{
sLog.outDebug("Entering HomeMovement::GetDestination(z,y,z)");
- owner.SetOrientation(ori);
+ owner.SetOrientation(ori);
WorldPacket packet;
owner.BuildHeartBeatMsg(&packet);
owner.SendMessageToSet(&packet, false);
diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h
index b89bc3fbcb1..964b5c3e801 100644
--- a/src/game/HomeMovementGenerator.h
+++ b/src/game/HomeMovementGenerator.h
@@ -48,7 +48,7 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature>
bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
- private:
+ private:
void _setTargetLocation(Creature &);
DestinationHolder< Traveller<Creature> > i_destinationHolder;
diff --git a/src/game/Language.h b/src/game/Language.h
index b58a5b82b60..07985f62bd2 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -272,9 +272,9 @@ enum TrinityStrings
LANG_COMMAND_WHISPERON = 285,
LANG_COMMAND_WHISPEROFF = 286,
LANG_COMMAND_CREATGUIDNOTFOUND = 287,
- // TICKET STRINGS NEED REWRITE // 288-296 FREE
+ // TICKET STRINGS NEED REWRITE // 288-296 FREE
- // END
+ // END
LANG_COMMAND_SPAWNDIST = 297,
LANG_COMMAND_SPAWNTIME = 298,
LANG_COMMAND_MODIFY_HONOR = 299,
@@ -768,7 +768,7 @@ enum TrinityStrings
// Room for more level 3 1128-1199 not used
// AV
- LANG_BG_AV_ALLY = 1200,
+ LANG_BG_AV_ALLY = 1200,
LANG_BG_AV_HORDE = 1201,
LANG_BG_AV_TOWER_TAKEN = 1202,
LANG_BG_AV_TOWER_ASSAULTED = 1203,
@@ -806,24 +806,24 @@ enum TrinityStrings
LANG_BG_AV_A_CAPTAIN_DEAD = 1232,
// FREE IDS 1233-9999
- // Ticket Strings 2000-2029
- LANG_COMMAND_TICKETNEW = 2000,
+ // Ticket Strings 2000-2029
+ LANG_COMMAND_TICKETNEW = 2000,
LANG_COMMAND_TICKETUPDATED = 2001,
- LANG_COMMAND_TICKETPLAYERABANDON = 2002,
- LANG_COMMAND_TICKETCLOSED = 2003,
- LANG_COMMAND_TICKETDELETED = 2004,
- LANG_COMMAND_TICKETNOTEXIST = 2005,
- LANG_COMMAND_TICKETCLOSEFIRST = 2006,
- LANG_COMMAND_TICKETALREADYASSIGNED = 2007,
- LANG_COMMAND_TICKETRELOAD = 2008,
- LANG_COMMAND_TICKETSHOWLIST = 2009,
- LANG_COMMAND_TICKETSHOWONLINELIST = 2010,
- LANG_COMMAND_TICKETSHOWCLOSEDLIST = 2011,
- LANG_COMMAND_TICKETASSIGNERROR_A = 2012,
- LANG_COMMAND_TICKETASSIGNERROR_B = 2013,
- LANG_COMMAND_TICKETNOTASSIGNED = 2014,
- LANG_COMMAND_TICKETUNASSIGNSECURITY = 2015,
- LANG_COMMAND_TICKETCANNOTCLOSE = 2016,
+ LANG_COMMAND_TICKETPLAYERABANDON = 2002,
+ LANG_COMMAND_TICKETCLOSED = 2003,
+ LANG_COMMAND_TICKETDELETED = 2004,
+ LANG_COMMAND_TICKETNOTEXIST = 2005,
+ LANG_COMMAND_TICKETCLOSEFIRST = 2006,
+ LANG_COMMAND_TICKETALREADYASSIGNED = 2007,
+ LANG_COMMAND_TICKETRELOAD = 2008,
+ LANG_COMMAND_TICKETSHOWLIST = 2009,
+ LANG_COMMAND_TICKETSHOWONLINELIST = 2010,
+ LANG_COMMAND_TICKETSHOWCLOSEDLIST = 2011,
+ LANG_COMMAND_TICKETASSIGNERROR_A = 2012,
+ LANG_COMMAND_TICKETASSIGNERROR_B = 2013,
+ LANG_COMMAND_TICKETNOTASSIGNED = 2014,
+ LANG_COMMAND_TICKETUNASSIGNSECURITY = 2015,
+ LANG_COMMAND_TICKETCANNOTCLOSE = 2016,
LANG_COMMAND_TICKETLISTGUID = 2017,
LANG_COMMAND_TICKETLISTNAME = 2018,
LANG_COMMAND_TICKETLISTAGE = 2019,
@@ -925,7 +925,7 @@ enum TrinityStrings
LANG_OPVP_EP_FLIGHT_CGT = 10053,
LANG_OPVP_ZM_GOSSIP_ALLIANCE = 10054,
LANG_OPVP_ZM_GOSSIP_HORDE = 10055,
-
+
// Use for custom patches 11000-11999
// NOT RESERVED IDS 12000-1999999999
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 956a9d92549..0377d299945 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -2145,7 +2145,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
return false;
}
- if(HasLowerSecurity(player, 0))
+ if(HasLowerSecurity(player, 0))
{
SendSysMessage(LANG_YOURS_SECURITY_IS_LOW); //maybe replacement string for this later on
SetSentErrorMessage(true);
@@ -2153,21 +2153,21 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
}
std::string nameLink = playerLink(name);
-
- if(sWorld.KickPlayer(name))
+
+ if(sWorld.KickPlayer(name))
{
if(sWorld.getConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1)
{
- sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, nameLink.c_str(), kicker.c_str(), reason.c_str());
+ sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, nameLink.c_str(), kicker.c_str(), reason.c_str());
}
else
{
- PSendSysMessage(LANG_COMMAND_KICKMESSAGE,nameLink.c_str());
+ PSendSysMessage(LANG_COMMAND_KICKMESSAGE,nameLink.c_str());
}
}
else
{
- PSendSysMessage(LANG_COMMAND_KICKNOTFOUNDPLAYER,nameLink.c_str());
+ PSendSysMessage(LANG_COMMAND_KICKNOTFOUNDPLAYER,nameLink.c_str());
return false;
}
}
@@ -4458,7 +4458,7 @@ bool ChatHandler::HandlePetTpCommand(const char *args)
uint32 tp = atol(args);
- //pet->SetTP(tp);
+ //pet->SetTP(tp);
PSendSysMessage("Pet's tp changed to %u", tp);
return true;
@@ -4570,9 +4570,9 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
}
uint32 lowguid = pCreature->GetDBTableGUIDLow();
- if(pCreature->GetFormation())
+ if(pCreature->GetFormation())
{
- PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormation()->GetId());
+ PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormation()->GetId());
return false;
}
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 4c629fcf40b..de27815594a 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -311,266 +311,266 @@ libmangosgame_a_SOURCES = \
GroupReference.h \
GroupRefManager.h
=======
- AccountMgr.cpp \
- AccountMgr.h \
- AchievementMgr.h \
- AchievementMgr.cpp \
- AggressorAI.cpp \
- AggressorAI.h \
- AnimalRandomMovementGenerator.h \
- ArenaTeam.cpp \
- ArenaTeam.h \
- ArenaTeamHandler.cpp \
- AuctionHouseHandler.cpp \
- AuctionHouseMgr.cpp \
- AuctionHouseMgr.h \
- Bag.cpp \
- Bag.h \
- BattleGround.cpp \
- BattleGroundAA.cpp \
- BattleGroundAB.cpp \
- BattleGroundAV.cpp \
- BattleGroundBE.cpp \
- BattleGroundDS.cpp \
- BattleGroundEY.cpp \
- BattleGroundNA.cpp \
- BattleGroundRL.cpp \
- BattleGroundRV.cpp \
- BattleGroundSA.cpp \
- BattleGroundWS.cpp \
- BattleGround.h \
- BattleGroundAA.h \
- BattleGroundAB.h \
- BattleGroundAV.h \
- BattleGroundBE.h \
- BattleGroundDS.h \
- BattleGroundEY.h \
- BattleGroundNA.h \
- BattleGroundRL.h \
- BattleGroundRV.h \
- BattleGroundSA.h \
- BattleGroundWS.h \
- BattleGroundHandler.cpp \
- BattleGroundMgr.cpp \
- BattleGroundMgr.h \
- Calendar.cpp \
- Calendar.h \
- CalendarHandler.cpp \
- Cell.h \
- CellImpl.h \
- Channel.cpp \
- Channel.h \
- ChannelHandler.cpp \
- ChannelMgr.h \
- CharacterHandler.cpp \
- Chat.cpp \
- Chat.h \
- ChatHandler.cpp \
- CombatHandler.cpp \
- ConfusedMovementGenerator.cpp \
- ConfusedMovementGenerator.h \
- Corpse.cpp \
- Corpse.h \
- CreatureAI.cpp \
- CreatureAI.h \
- CreatureAIImpl.h \
- CreatureAIRegistry.cpp \
- CreatureAIRegistry.h \
- CreatureAISelector.cpp \
- CreatureAISelector.h \
- Creature.cpp \
- Creature.h \
- DBCEnums.h \
- DBCfmt.h \
- DBCStores.cpp \
- DBCStores.h \
- DBCStructure.h \
- debugcmds.cpp \
- DestinationHolder.cpp \
- DestinationHolder.h \
- DestinationHolderImp.h \
- DuelHandler.cpp \
- DynamicObject.cpp \
- DynamicObject.h \
- FleeingMovementGenerator.cpp \
- FleeingMovementGenerator.h \
- Formulas.h \
- GameEventMgr.cpp \
- GameEventMgr.h \
- GameObject.cpp \
- GameObject.h \
- GlobalEvents.cpp \
- GlobalEvents.h \
- GMTicketHandler.cpp \
- GMTicketMgr.cpp \
- GMTicketMgr.h \
- GossipDef.cpp \
- GossipDef.h \
- GridDefines.h \
- GridNotifiers.cpp \
- GridNotifiers.h \
- GridNotifiersImpl.h \
- GridStates.cpp \
- GridStates.h \
- Group.cpp \
- Group.h \
- GroupHandler.cpp \
- GuardAI.cpp \
- GuardAI.h \
- Guild.cpp \
- Guild.h \
- GuildHandler.cpp \
- HomeMovementGenerator.cpp \
- HomeMovementGenerator.h \
- HostilRefManager.cpp \
- HostilRefManager.h \
- IdleMovementGenerator.cpp \
- IdleMovementGenerator.h \
- InstanceData.cpp \
- InstanceData.h \
- InstanceSaveMgr.cpp \
- InstanceSaveMgr.h \
- Item.cpp \
- Item.h \
- ItemEnchantmentMgr.cpp \
- ItemEnchantmentMgr.h \
- ItemHandler.cpp \
- ItemPrototype.h \
- Language.h \
- Level0.cpp \
- Level1.cpp \
- Level2.cpp \
- Level3.cpp \
- LFGHandler.cpp \
- LootHandler.cpp \
- LootMgr.cpp \
- LootMgr.h \
- Mail.cpp \
- Mail.h \
- Map.cpp \
- Map.h \
- MapInstanced.cpp \
- MapInstanced.h \
- MapManager.cpp \
- MapManager.h \
- MapReference.h \
- MapRefManager.h \
- MiscHandler.cpp \
- MotionMaster.cpp \
- MotionMaster.h \
- MovementGenerator.cpp \
- MovementGenerator.h \
- MovementGeneratorImpl.h \
- MovementHandler.cpp \
- NPCHandler.cpp \
- NPCHandler.h \
- NullCreatureAI.cpp \
- NullCreatureAI.h \
- ObjectAccessor.cpp \
- ObjectAccessor.h \
- Object.cpp \
- ObjectDefines.h \
- ObjectGridLoader.cpp \
- ObjectGridLoader.h \
- Object.h \
- ObjectMgr.cpp \
- ObjectMgr.h \
- ObjectPosSelector.cpp \
- ObjectPosSelector.h \
- Opcodes.cpp \
- Opcodes.h \
- Path.h \
- PetAI.cpp \
- PetAI.h \
- Pet.cpp \
- Pet.h \
- PetHandler.cpp \
- PetitionsHandler.cpp \
- Player.cpp \
- Player.h \
- PlayerDump.cpp \
- PlayerDump.h \
- PointMovementGenerator.cpp \
- PointMovementGenerator.h \
- PoolHandler.cpp \
- PoolHandler.h \
- QueryHandler.cpp \
- QuestDef.cpp \
- QuestDef.h \
- QuestHandler.cpp \
- RandomMovementGenerator.cpp \
- RandomMovementGenerator.h \
- ReactorAI.cpp \
- ReactorAI.h \
- ReputationMgr.cpp \
- ReputationMgr.h \
- ScriptCalls.cpp \
- ScriptCalls.h \
- SharedDefines.h \
- SkillHandler.cpp \
- SpellAuraDefines.h \
- SpellAuras.cpp \
- SpellAuras.h \
- Spell.cpp \
- SpellEffects.cpp \
- Spell.h \
- SkillDiscovery.cpp \
- SkillDiscovery.h \
- SkillExtraItems.cpp \
- SkillExtraItems.h \
- SpellHandler.cpp \
- SocialMgr.cpp \
- SocialMgr.h \
- SpellMgr.cpp \
- SpellMgr.h \
- StatSystem.cpp \
- TargetedMovementGenerator.cpp \
- TargetedMovementGenerator.h \
- TaxiHandler.cpp \
- TemporarySummon.cpp \
- TemporarySummon.h \
- TotemAI.cpp \
- TotemAI.h \
- Totem.cpp \
- Totem.h \
- TradeHandler.cpp \
- Transports.cpp \
- Transports.h \
- ThreatManager.cpp \
- ThreatManager.h \
- Traveller.h \
- Unit.cpp \
- Unit.h \
- UnitEvents.h \
- UpdateData.cpp \
- UpdateData.h \
- UpdateFields.h \
- UpdateMask.h \
- Vehicle.cpp \
- Vehicle.h \
- VoiceChatHandler.cpp \
- WaypointManager.cpp \
- WaypointManager.h \
- WaypointMovementGenerator.cpp \
- WaypointMovementGenerator.h \
- Weather.cpp \
- Weather.h \
- World.cpp \
- World.h \
- WorldLog.cpp \
- WorldLog.h \
- WorldSession.cpp \
- WorldSession.h \
- WorldSocket.cpp \
- WorldSocket.h \
- WorldSocketMgr.cpp \
- WorldSocketMgr.h \
- FollowerReference.cpp \
- FollowerReference.h \
- FollowerRefManager.h \
- GroupReference.cpp \
- GroupReference.h \
- GroupRefManager.h
+ AccountMgr.cpp \
+ AccountMgr.h \
+ AchievementMgr.h \
+ AchievementMgr.cpp \
+ AggressorAI.cpp \
+ AggressorAI.h \
+ AnimalRandomMovementGenerator.h \
+ ArenaTeam.cpp \
+ ArenaTeam.h \
+ ArenaTeamHandler.cpp \
+ AuctionHouseHandler.cpp \
+ AuctionHouseMgr.cpp \
+ AuctionHouseMgr.h \
+ Bag.cpp \
+ Bag.h \
+ BattleGround.cpp \
+ BattleGroundAA.cpp \
+ BattleGroundAB.cpp \
+ BattleGroundAV.cpp \
+ BattleGroundBE.cpp \
+ BattleGroundDS.cpp \
+ BattleGroundEY.cpp \
+ BattleGroundNA.cpp \
+ BattleGroundRL.cpp \
+ BattleGroundRV.cpp \
+ BattleGroundSA.cpp \
+ BattleGroundWS.cpp \
+ BattleGround.h \
+ BattleGroundAA.h \
+ BattleGroundAB.h \
+ BattleGroundAV.h \
+ BattleGroundBE.h \
+ BattleGroundDS.h \
+ BattleGroundEY.h \
+ BattleGroundNA.h \
+ BattleGroundRL.h \
+ BattleGroundRV.h \
+ BattleGroundSA.h \
+ BattleGroundWS.h \
+ BattleGroundHandler.cpp \
+ BattleGroundMgr.cpp \
+ BattleGroundMgr.h \
+ Calendar.cpp \
+ Calendar.h \
+ CalendarHandler.cpp \
+ Cell.h \
+ CellImpl.h \
+ Channel.cpp \
+ Channel.h \
+ ChannelHandler.cpp \
+ ChannelMgr.h \
+ CharacterHandler.cpp \
+ Chat.cpp \
+ Chat.h \
+ ChatHandler.cpp \
+ CombatHandler.cpp \
+ ConfusedMovementGenerator.cpp \
+ ConfusedMovementGenerator.h \
+ Corpse.cpp \
+ Corpse.h \
+ CreatureAI.cpp \
+ CreatureAI.h \
+ CreatureAIImpl.h \
+ CreatureAIRegistry.cpp \
+ CreatureAIRegistry.h \
+ CreatureAISelector.cpp \
+ CreatureAISelector.h \
+ Creature.cpp \
+ Creature.h \
+ DBCEnums.h \
+ DBCfmt.h \
+ DBCStores.cpp \
+ DBCStores.h \
+ DBCStructure.h \
+ debugcmds.cpp \
+ DestinationHolder.cpp \
+ DestinationHolder.h \
+ DestinationHolderImp.h \
+ DuelHandler.cpp \
+ DynamicObject.cpp \
+ DynamicObject.h \
+ FleeingMovementGenerator.cpp \
+ FleeingMovementGenerator.h \
+ Formulas.h \
+ GameEventMgr.cpp \
+ GameEventMgr.h \
+ GameObject.cpp \
+ GameObject.h \
+ GlobalEvents.cpp \
+ GlobalEvents.h \
+ GMTicketHandler.cpp \
+ GMTicketMgr.cpp \
+ GMTicketMgr.h \
+ GossipDef.cpp \
+ GossipDef.h \
+ GridDefines.h \
+ GridNotifiers.cpp \
+ GridNotifiers.h \
+ GridNotifiersImpl.h \
+ GridStates.cpp \
+ GridStates.h \
+ Group.cpp \
+ Group.h \
+ GroupHandler.cpp \
+ GuardAI.cpp \
+ GuardAI.h \
+ Guild.cpp \
+ Guild.h \
+ GuildHandler.cpp \
+ HomeMovementGenerator.cpp \
+ HomeMovementGenerator.h \
+ HostilRefManager.cpp \
+ HostilRefManager.h \
+ IdleMovementGenerator.cpp \
+ IdleMovementGenerator.h \
+ InstanceData.cpp \
+ InstanceData.h \
+ InstanceSaveMgr.cpp \
+ InstanceSaveMgr.h \
+ Item.cpp \
+ Item.h \
+ ItemEnchantmentMgr.cpp \
+ ItemEnchantmentMgr.h \
+ ItemHandler.cpp \
+ ItemPrototype.h \
+ Language.h \
+ Level0.cpp \
+ Level1.cpp \
+ Level2.cpp \
+ Level3.cpp \
+ LFGHandler.cpp \
+ LootHandler.cpp \
+ LootMgr.cpp \
+ LootMgr.h \
+ Mail.cpp \
+ Mail.h \
+ Map.cpp \
+ Map.h \
+ MapInstanced.cpp \
+ MapInstanced.h \
+ MapManager.cpp \
+ MapManager.h \
+ MapReference.h \
+ MapRefManager.h \
+ MiscHandler.cpp \
+ MotionMaster.cpp \
+ MotionMaster.h \
+ MovementGenerator.cpp \
+ MovementGenerator.h \
+ MovementGeneratorImpl.h \
+ MovementHandler.cpp \
+ NPCHandler.cpp \
+ NPCHandler.h \
+ NullCreatureAI.cpp \
+ NullCreatureAI.h \
+ ObjectAccessor.cpp \
+ ObjectAccessor.h \
+ Object.cpp \
+ ObjectDefines.h \
+ ObjectGridLoader.cpp \
+ ObjectGridLoader.h \
+ Object.h \
+ ObjectMgr.cpp \
+ ObjectMgr.h \
+ ObjectPosSelector.cpp \
+ ObjectPosSelector.h \
+ Opcodes.cpp \
+ Opcodes.h \
+ Path.h \
+ PetAI.cpp \
+ PetAI.h \
+ Pet.cpp \
+ Pet.h \
+ PetHandler.cpp \
+ PetitionsHandler.cpp \
+ Player.cpp \
+ Player.h \
+ PlayerDump.cpp \
+ PlayerDump.h \
+ PointMovementGenerator.cpp \
+ PointMovementGenerator.h \
+ PoolHandler.cpp \
+ PoolHandler.h \
+ QueryHandler.cpp \
+ QuestDef.cpp \
+ QuestDef.h \
+ QuestHandler.cpp \
+ RandomMovementGenerator.cpp \
+ RandomMovementGenerator.h \
+ ReactorAI.cpp \
+ ReactorAI.h \
+ ReputationMgr.cpp \
+ ReputationMgr.h \
+ ScriptCalls.cpp \
+ ScriptCalls.h \
+ SharedDefines.h \
+ SkillHandler.cpp \
+ SpellAuraDefines.h \
+ SpellAuras.cpp \
+ SpellAuras.h \
+ Spell.cpp \
+ SpellEffects.cpp \
+ Spell.h \
+ SkillDiscovery.cpp \
+ SkillDiscovery.h \
+ SkillExtraItems.cpp \
+ SkillExtraItems.h \
+ SpellHandler.cpp \
+ SocialMgr.cpp \
+ SocialMgr.h \
+ SpellMgr.cpp \
+ SpellMgr.h \
+ StatSystem.cpp \
+ TargetedMovementGenerator.cpp \
+ TargetedMovementGenerator.h \
+ TaxiHandler.cpp \
+ TemporarySummon.cpp \
+ TemporarySummon.h \
+ TotemAI.cpp \
+ TotemAI.h \
+ Totem.cpp \
+ Totem.h \
+ TradeHandler.cpp \
+ Transports.cpp \
+ Transports.h \
+ ThreatManager.cpp \
+ ThreatManager.h \
+ Traveller.h \
+ Unit.cpp \
+ Unit.h \
+ UnitEvents.h \
+ UpdateData.cpp \
+ UpdateData.h \
+ UpdateFields.h \
+ UpdateMask.h \
+ Vehicle.cpp \
+ Vehicle.h \
+ VoiceChatHandler.cpp \
+ WaypointManager.cpp \
+ WaypointManager.h \
+ WaypointMovementGenerator.cpp \
+ WaypointMovementGenerator.h \
+ Weather.cpp \
+ Weather.h \
+ World.cpp \
+ World.h \
+ WorldLog.cpp \
+ WorldLog.h \
+ WorldSession.cpp \
+ WorldSession.h \
+ WorldSocket.cpp \
+ WorldSocket.h \
+ WorldSocketMgr.cpp \
+ WorldSocketMgr.h \
+ FollowerReference.cpp \
+ FollowerReference.h \
+ FollowerRefManager.h \
+ GroupReference.cpp \
+ GroupReference.h \
+ GroupRefManager.h
>>>>>>> 2429aaf2276d689e101ed88285f18449dbe4280d:src/game/Makefile.am
## Link against shared library
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index d4199c2099e..6d7a40da045 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -525,9 +525,9 @@ void MotionMaster::DelayedDelete(_Ty curr)
bool MotionMaster::GetDestination(float &x, float &y, float &z)
{
- if(empty())
+ if(empty())
return false;
-
- return top()->GetDestination(x,y,z);
+
+ return top()->GetDestination(x,y,z);
}
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index a4128249468..1b0f347b8aa 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -5149,9 +5149,9 @@ void ObjectMgr::LoadAccessRequirements()
uint32 count = 0;
- // 0 1 2 3 4 5 6 7 8 9 10
+ // 0 1 2 3 4 5 6 7 8 9 10
QueryResult *result = WorldDatabase.Query("SELECT id, level_min, level_max, item, item2, heroic_key, heroic_key2, quest_done, quest_failed_text, heroic_quest_done, heroic_quest_failed_text FROM access_requirement");
- if( !result )
+ if( !result )
{
barGoLink bar( 1 );
@@ -5228,15 +5228,15 @@ void ObjectMgr::LoadAccessRequirements()
}
}
- if(ar.heroicQuest)
- {
+ if(ar.heroicQuest)
+ {
QuestMap::iterator qReqItr = mQuestTemplates.find(ar.heroicQuest);
if(qReqItr == mQuestTemplates.end())
- {
- sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
- ar.heroicQuest = 0;
- }
- }
+ {
+ sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
+ ar.heroicQuest = 0;
+ }
+ }
if(ar.quest)
{
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index f29b81c11f4..e24c2331345 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -15524,7 +15524,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
missingItem = ar->item2;
uint32 missingKey = 0;
- uint32 missingHeroicQuest = 0;
+ uint32 missingHeroicQuest = 0;
if(GetDifficulty() == DIFFICULTY_HEROIC)
{
if(ar->heroicKey)
@@ -15536,7 +15536,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
else if(ar->heroicKey2 && !HasItemCount(ar->heroicKey2, 1))
missingKey = ar->heroicKey2;
- if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest))
+ if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest))
missingHeroicQuest = ar->heroicQuest;
}
diff --git a/src/game/Player.h b/src/game/Player.h
index 087ca5e9cdc..4738ce603a0 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -784,7 +784,7 @@ struct AccessRequirement
uint32 heroicKey2;
uint32 quest;
std::string questFailedText;
- uint32 heroicQuest;
+ uint32 heroicQuest;
std::string heroicQuestFailedText;
};
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp
index 763e7f12c5a..0081c702abd 100644
--- a/src/game/RandomMovementGenerator.cpp
+++ b/src/game/RandomMovementGenerator.cpp
@@ -117,10 +117,10 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
}
//Call for creature group update
- if(creature.GetFormation() && creature.GetFormation()->getLeader() == &creature)
- {
+ if(creature.GetFormation() && creature.GetFormation()->getLeader() == &creature)
+ {
creature.GetFormation()->LeaderMoveTo(nx, ny, nz);
- }
+ }
}
template<>
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
index ba486300be9..529517d824a 100644
--- a/src/game/SocialMgr.cpp
+++ b/src/game/SocialMgr.cpp
@@ -189,7 +189,7 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &fri
Player *pFriend = ObjectAccessor::FindPlayer(friendGUID);
if(!pFriend)
- return;
+ return;
uint32 team = player->GetTeam();
uint32 security = player->GetSession()->GetSecurity();
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index cb4214dc11f..5dac4ca1a7e 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1340,13 +1340,13 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastCustomSpell(m_caster,34846,&chargeBasePoints0,NULL,NULL,true);
return;
}
- //Slam
- if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559)
- {
- int32 bp0 = damage;
- m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0);
+ //Slam
+ if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559)
+ {
+ int32 bp0 = damage;
+ m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0);
return;
- }
+ }
// Execute
if(m_spellInfo->SpellFamilyFlags[0] & 0x20000000)
{
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index a8bdcb1ad5d..57b68ae55d9 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2326,7 +2326,7 @@ void SpellMgr::LoadSpellCustomAttr()
case 45027: // Revitalize
case 45976: // Muru Portal Channel
case 39365: // Thundering Storm
- case 41071: // Raise Dead (HACK)
+ case 41071: // Raise Dead (HACK)
spellInfo->MaxAffectedTargets = 1;
break;
case 41376: // Spite
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 10694d1de2b..228622ecc2f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9544,10 +9544,10 @@ void Unit::CombatStart(Unit* target)
{
((Creature*)target)->AI()->AttackStart(this);
if(((Creature*)target)->GetFormation())
- {
- ((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this);
- sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
- }
+ {
+ ((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this);
+ sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
+ }
}
SetInCombatWith(target);
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index c6607b2b24e..7c606697ac3 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -53,9 +53,9 @@ void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
template<>
bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
{
- if(i_destinationHolder.HasArrived())
+ if(i_destinationHolder.HasArrived())
return false;
-
+
i_destinationHolder.GetDestination(x, y, z);
return true;
}
@@ -112,7 +112,7 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u)
i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
//Call for creature group update
- if(u.GetFormation() && u.GetFormation()->getLeader() == &u)
+ if(u.GetFormation() && u.GetFormation()->getLeader() == &u)
u.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
}
else
@@ -187,7 +187,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
//Call for creature group update
- if(unit.GetFormation() && unit.GetFormation()->getLeader() == &unit)
+ if(unit.GetFormation() && unit.GetFormation()->getLeader() == &unit)
unit.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
}
else
diff --git a/src/game/World.cpp b/src/game/World.cpp
index def0bdf2691..d138c4c1bb4 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1526,17 +1526,17 @@ void World::SetInitialWorldSettings()
sLog.outString("Initialize AuctionHouseBot...");
AuctionHouseBotInit();
- // possibly enable db logging; avoid massive startup spam by doing it here.
- if (sLog.GetLogDBLater())
- {
- sLog.outString("Enabling database logging...");
- sLog.SetLogDBLater(false);
- sLog.SetLogDB(true);
- }
- else
- {
- sLog.SetLogDBLater(false);
- }
+ // possibly enable db logging; avoid massive startup spam by doing it here.
+ if (sLog.GetLogDBLater())
+ {
+ sLog.outString("Enabling database logging...");
+ sLog.SetLogDBLater(false);
+ sLog.SetLogDB(true);
+ }
+ else
+ {
+ sLog.SetLogDBLater(false);
+ }
sLog.outString( "WORLD: World initialized" );
}