*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -4,8 +4,8 @@
|
|||||||
#include "Database/DatabaseEnv.h"
|
#include "Database/DatabaseEnv.h"
|
||||||
#include "Item.h"
|
#include "Item.h"
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
#include "AuctionHouseMgr.h"
|
|
||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
|
#include "AuctionHouseMgr.h"
|
||||||
#include "Player.h"
|
#include "Player.h"
|
||||||
#include "World.h"
|
#include "World.h"
|
||||||
#include "WorldSession.h"
|
#include "WorldSession.h"
|
||||||
@@ -816,8 +816,8 @@ void AuctionHouseBot()
|
|||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
void AuctionHouseBotInit()
|
void AuctionHouseBotInit()
|
||||||
{
|
{
|
||||||
AHBSeller = false;//sConfig.GetBoolDefault("AuctionHouseBot.EnableSeller", false);
|
sConfig.GetBoolDefault("AuctionHouseBot.EnableSeller", false);
|
||||||
AHBBuyer = false;//sConfig.GetBoolDefault("AuctionHouseBot.EnableBuyer", false);
|
sConfig.GetBoolDefault("AuctionHouseBot.EnableBuyer", false);
|
||||||
No_Bind = sConfig.GetBoolDefault("AuctionHouseBot.No_Bind", true);
|
No_Bind = sConfig.GetBoolDefault("AuctionHouseBot.No_Bind", true);
|
||||||
Bind_When_Picked_Up = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Picked_Up", false);
|
Bind_When_Picked_Up = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Picked_Up", false);
|
||||||
Bind_When_Equipped = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Equipped", true);
|
Bind_When_Equipped = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Equipped", true);
|
||||||
|
|||||||
+24
-24
@@ -154,30 +154,30 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor
|
|||||||
|
|
||||||
Player* FindPlayerByName(const char *name) ;
|
Player* FindPlayerByName(const char *name) ;
|
||||||
|
|
||||||
HashMapHolder<Player>::MapType& GetPlayers()
|
HashMapHolder<Player>::MapType& GetPlayers()
|
||||||
{
|
{
|
||||||
return HashMapHolder<Player>::GetContainer();
|
return HashMapHolder<Player>::GetContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
HashMapHolder<Creature>::MapType& GetCreatures()
|
HashMapHolder<Creature>::MapType& GetCreatures()
|
||||||
{
|
{
|
||||||
return HashMapHolder<Creature>::GetContainer();
|
return HashMapHolder<Creature>::GetContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
HashMapHolder<Unit>::MapType& GetUnits()
|
HashMapHolder<Unit>::MapType& GetUnits()
|
||||||
{
|
{
|
||||||
return HashMapHolder<Unit>::GetContainer();
|
return HashMapHolder<Unit>::GetContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
HashMapHolder<GameObject>::MapType& GetGameObjects()
|
HashMapHolder<GameObject>::MapType& GetGameObjects()
|
||||||
{
|
{
|
||||||
return HashMapHolder<GameObject>::GetContainer();
|
return HashMapHolder<GameObject>::GetContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
// note: possibly very heavy
|
// note: possibly very heavy
|
||||||
HashMapHolder<WorldObject>::MapType& GetWorldObjects()
|
HashMapHolder<WorldObject>::MapType& GetWorldObjects()
|
||||||
{
|
{
|
||||||
return HashMapHolder<WorldObject>::GetContainer();
|
return HashMapHolder<WorldObject>::GetContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class T> void AddObject(T *object)
|
template<class T> void AddObject(T *object)
|
||||||
|
|||||||
Reference in New Issue
Block a user