From d86ad9e91fd1623be131f3f558dba34ac0040925 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Fri, 22 Jan 2010 00:25:09 +0300
Subject: [PATCH] [9233] Restore build at *nix after [9228]

Partly undo changes.

Thanks to DasBlub and Lightguard for testing.
---
 src/game/ObjectMgr.cpp   | 30 ++++++++++++++++++++++++++++++
 src/game/ObjectMgr.h     | 15 ++++++---------
 src/shared/revision_nr.h |  2 +-
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index fb598191f..850b18624 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8395,6 +8395,36 @@ void ObjectMgr::LoadDbScriptStrings()
         sLog.outErrorDb( "Table `db_script_string` has unused string id  %u", *itr);
 }
 
+void ObjectMgr::AddGuild( Guild* guild )
+{
+    mGuildMap[guild->GetId()] = guild ;
+}
+
+void ObjectMgr::RemoveGuild( uint32 Id )
+{
+    mGuildMap.erase(Id);
+}
+
+void ObjectMgr::AddGroup( Group* group )
+{
+    mGroupMap[GUID_LOPART(group->GetLeaderGUID())] = group ;
+}
+
+void ObjectMgr::RemoveGroup( Group* group )
+{
+    mGroupMap.erase(GUID_LOPART(group->GetLeaderGUID()));
+}
+
+void ObjectMgr::AddArenaTeam( ArenaTeam* arenaTeam )
+{
+    mArenaTeamMap[arenaTeam->GetId()] = arenaTeam;
+}
+
+void ObjectMgr::RemoveArenaTeam( uint32 Id )
+{
+    mArenaTeamMap.erase(Id);
+}
+
 // Functions for scripting access
 uint32 GetAreaTriggerScriptId(uint32 trigger_id)
 {
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 9099dc5a5..d27a2fe7e 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -33,9 +33,6 @@
 #include "Database/DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
-#include "Group.h"
-#include "Guild.h"
-#include "ArenaTeam.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "Policies/Singleton.h"
@@ -412,21 +409,21 @@ class ObjectMgr
         void AddGameobjectInfo(GameObjectInfo *goinfo);
 
         Group * GetGroupByLeaderLowGUID(uint32 lowguid) const;
-        void AddGroup(Group* group) { mGroupMap[GUID_LOPART(group->GetLeaderGUID())] = group ; }
-        void RemoveGroup(Group* group) { mGroupMap.erase(GUID_LOPART(group->GetLeaderGUID())); }
+        void AddGroup(Group* group);
+        void RemoveGroup(Group* group);
 
         Guild* GetGuildByLeader(uint64 const&guid) const;
         Guild* GetGuildById(uint32 GuildId) const;
         Guild* GetGuildByName(const std::string& guildname) const;
         std::string GetGuildNameById(uint32 GuildId) const;
-        void AddGuild(Guild* guild) { mGuildMap[guild->GetId()] = guild ; }
-        void RemoveGuild(uint32 Id) { mGuildMap.erase(Id); }
+        void AddGuild(Guild* guild);
+        void RemoveGuild(uint32 Id);
 
         ArenaTeam* GetArenaTeamById(uint32 arenateamid) const;
         ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const;
         ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const;
-        void AddArenaTeam(ArenaTeam* arenaTeam) { mArenaTeamMap[arenaTeam->GetId()] = arenaTeam; }
-        void RemoveArenaTeam(uint32 Id) { mArenaTeamMap.erase(Id); }
+        void AddArenaTeam(ArenaTeam* arenaTeam);
+        void RemoveArenaTeam(uint32 Id);
         ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); }
         ArenaTeamMap::iterator GetArenaTeamMapEnd()   { return mArenaTeamMap.end(); }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2ea0d4a38..b8e87ebfc 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9232"
+ #define REVISION_NR "9233"
 #endif // __REVISION_NR_H__
-- 
2.11.4.GIT