Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-31 18:22:32 -06:00
parent 8408fb7cd3 3430bedb64
commit 4ed49490ae
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/AuctionHouseBot.cpp
View File

@@ -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);

48
src/game/ObjectAccessor.h
View File

@@ -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)