nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 00:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBC Move WorldSafeLocs.dbc storage to DB (#932)

Browse Source
This commit is contained in:
Kargatum
2019-01-08 13:37:31 +07:00
committed by Viste(Кирилл)
parent 3d416de893
commit 1a9f8dfc0c
38 changed files with 1262 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Battlefield/Battlefield.cpp
View File

@@ -20,6 +20,7 @@
#include "CreatureTextMgr.h"
#include "GroupMgr.h"
#include "Transport.h"
#include "GameGraveyard.h"
Battlefield::Battlefield()
{
@@ -583,7 +584,7 @@ BfGraveyard* Battlefield::GetGraveyardById(uint32 id) const
return NULL;
}
WorldSafeLocsEntry const * Battlefield::GetClosestGraveyard(Player* player)
GraveyardStruct const * Battlefield::GetClosestGraveyard(Player* player)
{
BfGraveyard* closestGY = NULL;
float maxdist = -1;
@@ -604,7 +605,7 @@ WorldSafeLocsEntry const * Battlefield::GetClosestGraveyard(Player* player)
}
if (closestGY)
return sWorldSafeLocsStore.LookupEntry(closestGY->GetGraveyardId());
return sGraveyard->GetGraveyard(closestGY->GetGraveyardId());
return NULL;
}
@@ -682,7 +683,7 @@ void BfGraveyard::SetSpirit(Creature* spirit, TeamId team)
float BfGraveyard::GetDistance(Player* player)
{
const WorldSafeLocsEntry* safeLoc = sWorldSafeLocsStore.LookupEntry(m_GraveyardId);
const GraveyardStruct* safeLoc = sGraveyard->GetGraveyard(m_GraveyardId);
return player->GetDistance2d(safeLoc->x, safeLoc->y);
}
@@ -744,7 +745,7 @@ void BfGraveyard::GiveControlTo(TeamId team)
void BfGraveyard::RelocateDeadPlayers()
{
WorldSafeLocsEntry const* closestGrave = NULL;
GraveyardStruct const* closestGrave = NULL;
for (GuidSet::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr)
{
Player* player = ObjectAccessor::FindPlayer(*itr);

2
src/server/game/Battlefield/Battlefield.h
View File

@@ -285,7 +285,7 @@ class Battlefield : public ZoneScript
// Graveyard methods
// Find which graveyard the player must be teleported to to be resurrected by spiritguide
WorldSafeLocsEntry const * GetClosestGraveyard(Player* player);
GraveyardStruct const * GetClosestGraveyard(Player* player);
virtual void AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid);
void RemovePlayerFromResurrectQueue(uint64 player_guid);