From 9bf1412fd87c58ae039b2da43c1280ae185126aa Mon Sep 17 00:00:00 2001
From: Chaz Brown <iamparadox@netscape.net>
Date: Tue, 31 Mar 2009 19:32:04 -0400
Subject: CRLF fix

--HG--
branch : trunk
---
 src/game/ObjectAccessor.h | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index 218d1d91995..d1549712f30 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -154,30 +154,30 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor
 
         Player* FindPlayerByName(const char *name) ;
 
-        HashMapHolder<Player>::MapType& GetPlayers()
-        {
-            return HashMapHolder<Player>::GetContainer();
-        }
-
-        HashMapHolder<Creature>::MapType& GetCreatures()
-        {
-            return HashMapHolder<Creature>::GetContainer();
-        }
-
-        HashMapHolder<Unit>::MapType& GetUnits()
-        {
-            return HashMapHolder<Unit>::GetContainer();
-        }
-
-        HashMapHolder<GameObject>::MapType& GetGameObjects()
-        {
-            return HashMapHolder<GameObject>::GetContainer();
-        }
-
-        // note: possibly very heavy
-        HashMapHolder<WorldObject>::MapType& GetWorldObjects()
-        {
-            return HashMapHolder<WorldObject>::GetContainer();
+        HashMapHolder<Player>::MapType& GetPlayers()
+        {
+            return HashMapHolder<Player>::GetContainer();
+        }
+
+        HashMapHolder<Creature>::MapType& GetCreatures()
+        {
+            return HashMapHolder<Creature>::GetContainer();
+        }
+
+        HashMapHolder<Unit>::MapType& GetUnits()
+        {
+            return HashMapHolder<Unit>::GetContainer();
+        }
+
+        HashMapHolder<GameObject>::MapType& GetGameObjects()
+        {
+            return HashMapHolder<GameObject>::GetContainer();
+        }
+
+        // note: possibly very heavy
+        HashMapHolder<WorldObject>::MapType& GetWorldObjects()
+        {
+            return HashMapHolder<WorldObject>::GetContainer();
         }
 
         template<class T> void AddObject(T *object)
-- 
cgit v1.2.3


From 3430bedb6498fa765f37d1b03fb87a9961844530 Mon Sep 17 00:00:00 2001
From: Chaz Brown <iamparadox@netscape.net>
Date: Tue, 31 Mar 2009 19:36:02 -0400
Subject: Re-Enable AHBot, in the future, the correct way is to have those with
 a problem check their config, not disabling it all together.

--HG--
branch : trunk
---
 src/game/AuctionHouseBot.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp
index fe948d1f4e4..e4bd532e0ac 100644
--- a/src/game/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot.cpp
@@ -4,8 +4,8 @@
 #include "Database/DatabaseEnv.h"
 #include "Item.h"
 #include "Log.h"
-#include "AuctionHouseMgr.h"
 #include "ObjectMgr.h"
+#include "AuctionHouseMgr.h"
 #include "Player.h"
 #include "World.h"
 #include "WorldSession.h"
@@ -816,8 +816,8 @@ void AuctionHouseBot()
 ///////////////////////////////////////////////////////////////////////////////
 void AuctionHouseBotInit()
 {
-    AHBSeller = false;//sConfig.GetBoolDefault("AuctionHouseBot.EnableSeller", false);
-    AHBBuyer = false;//sConfig.GetBoolDefault("AuctionHouseBot.EnableBuyer", false);
+    sConfig.GetBoolDefault("AuctionHouseBot.EnableSeller", false);
+    sConfig.GetBoolDefault("AuctionHouseBot.EnableBuyer", false);
     No_Bind = sConfig.GetBoolDefault("AuctionHouseBot.No_Bind", true);
     Bind_When_Picked_Up = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Picked_Up", false);
     Bind_When_Equipped = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Equipped", true);
-- 
cgit v1.2.3