mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9233] Restore build at *nix after [9228]

Browse source 
Partly undo changes.

Thanks to DasBlub and Lightguard for testing.
This commit is contained in:
VladimirMangos 2010-01-22 00:25:09 +03:00
parent 797dd6d931
commit abce7740f8
3 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/game/ObjectMgr.cpp
View file

@ -8395,6 +8395,36 @@ void ObjectMgr::LoadDbScriptStrings()
sLog.outErrorDb( "Table `db_script_string` has unused string id %u", *itr); 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 // Functions for scripting access
uint32 GetAreaTriggerScriptId(uint32 trigger_id) uint32 GetAreaTriggerScriptId(uint32 trigger_id)
{ {

15
src/game/ObjectMgr.h
View file

@ -33,9 +33,6 @@
#include "Database/DatabaseEnv.h" #include "Database/DatabaseEnv.h"
#include "Mail.h" #include "Mail.h"
#include "Map.h" #include "Map.h"
#include "Group.h"
#include "Guild.h"
#include "ArenaTeam.h"
#include "ObjectAccessor.h" #include "ObjectAccessor.h"
#include "ObjectDefines.h" #include "ObjectDefines.h"
#include "Policies/Singleton.h" #include "Policies/Singleton.h"
@ -412,21 +409,21 @@ class ObjectMgr
void AddGameobjectInfo(GameObjectInfo *goinfo); void AddGameobjectInfo(GameObjectInfo *goinfo);
Group * GetGroupByLeaderLowGUID(uint32 lowguid) const; Group * GetGroupByLeaderLowGUID(uint32 lowguid) const;
void AddGroup(Group* group) { mGroupMap[GUID_LOPART(group->GetLeaderGUID())] = group ; } void AddGroup(Group* group);
void RemoveGroup(Group* group) { mGroupMap.erase(GUID_LOPART(group->GetLeaderGUID())); } void RemoveGroup(Group* group);
Guild* GetGuildByLeader(uint64 const&guid) const; Guild* GetGuildByLeader(uint64 const&guid) const;
Guild* GetGuildById(uint32 GuildId) const; Guild* GetGuildById(uint32 GuildId) const;
Guild* GetGuildByName(const std::string& guildname) const; Guild* GetGuildByName(const std::string& guildname) const;
std::string GetGuildNameById(uint32 GuildId) const; std::string GetGuildNameById(uint32 GuildId) const;
void AddGuild(Guild* guild) { mGuildMap[guild->GetId()] = guild ; } void AddGuild(Guild* guild);
void RemoveGuild(uint32 Id) { mGuildMap.erase(Id); } void RemoveGuild(uint32 Id);
ArenaTeam* GetArenaTeamById(uint32 arenateamid) const; ArenaTeam* GetArenaTeamById(uint32 arenateamid) const;
ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const; ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const;
ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const; ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const;
void AddArenaTeam(ArenaTeam* arenaTeam) { mArenaTeamMap[arenaTeam->GetId()] = arenaTeam; } void AddArenaTeam(ArenaTeam* arenaTeam);
void RemoveArenaTeam(uint32 Id) { mArenaTeamMap.erase(Id); } void RemoveArenaTeam(uint32 Id);
ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); } ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); }
ArenaTeamMap::iterator GetArenaTeamMapEnd() { return mArenaTeamMap.end(); } ArenaTeamMap::iterator GetArenaTeamMapEnd() { return mArenaTeamMap.end(); }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9232" #define REVISION_NR "9233"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__