josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[7254] Cleanups and batter checking in homebind/bgEntryPoint code.

Browse Source 
* Load homebind data early in Player::LoadFromDB and use instead initital race points
      in cases need some safe point if current coordinate broken by some reason.
    * Store BG entry point in to WorldLocation and simplify calls.
    * Set bg entry point at GM teleports to battleground for correct
      auto-recall position at battleground end.

Author: VladimirMangos

--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-10 01:06:39 -06:00
parent ba7a8cc836
commit 58374f87b4
8 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.h
+4 -15
View File
@@ -1939,18 +1939,10 @@ class TRINITY_DLL_SPEC Player : public Unit
return true;
return false;
}
uint32 GetBattleGroundEntryPointMap() const { return m_bgEntryPointMap; }
float GetBattleGroundEntryPointX() const { return m_bgEntryPointX; }
float GetBattleGroundEntryPointY() const { return m_bgEntryPointY; }
float GetBattleGroundEntryPointZ() const { return m_bgEntryPointZ; }
float GetBattleGroundEntryPointO() const { return m_bgEntryPointO; }
WorldLocation const& GetBattleGroundEntryPoint() const { return m_bgEntryPoint; }
void SetBattleGroundEntryPoint(uint32 Map, float PosX, float PosY, float PosZ, float PosO )
{
m_bgEntryPointMap = Map;
m_bgEntryPointX = PosX;
m_bgEntryPointY = PosY;
m_bgEntryPointZ = PosZ;
m_bgEntryPointO = PosO;
m_bgEntryPoint = WorldLocation(Map,PosX,PosY,PosZ,PosO);
}
void SetBGTeam(uint32 team) { m_bgTeam = team; }
@@ -2075,6 +2067,7 @@ class TRINITY_DLL_SPEC Player : public Unit
float m_homebindX;
float m_homebindY;
float m_homebindZ;
void RelocateToHomebind() { SetMapId(m_homebindMapId); Relocate(m_homebindX,m_homebindY,m_homebindZ); }
// currently visible objects at player client
typedef std::set<uint64> ClientGUIDs;
@@ -2188,11 +2181,7 @@ class TRINITY_DLL_SPEC Player : public Unit
uint32 invitedToInstance;
};
BgBattleGroundQueueID_Rec m_bgBattleGroundQueueID[PLAYER_MAX_BATTLEGROUND_QUEUES];
uint32 m_bgEntryPointMap;
float m_bgEntryPointX;
float m_bgEntryPointY;
float m_bgEntryPointZ;
float m_bgEntryPointO;
WorldLocation m_bgEntryPoint;
std::set<uint32> m_bgAfkReporter;
uint8 m_bgAfkReportedCount;