pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-05 17:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proximity_x, proximity_y, and proximity_z converted to xyz_location m_Proximity

Browse Source
This commit is contained in:
Arthur Ice 2014-12-01 00:03:59 -08:00
parent e31c95670a
commit fb1d5842ea
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/client.cpp
View File

@ -155,7 +155,8 @@ Client::Client(EQStreamInterface* ieqs)
RespawnFromHoverTimer(0), RespawnFromHoverTimer(0),
merc_timer(RuleI(Mercs, UpkeepIntervalMS)), merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
ItemTickTimer(10000), ItemTickTimer(10000),
ItemQuestTimer(500) ItemQuestTimer(500),
m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX) //arbitrary large number
{ {
for(int cf=0; cf < _FilterCount; cf++) for(int cf=0; cf < _FilterCount; cf++)
ClientFilters[cf] = FilterShow; ClientFilters[cf] = FilterShow;
@ -208,9 +209,6 @@ Client::Client(EQStreamInterface* ieqs)
zonesummon_ignorerestrictions = 0; zonesummon_ignorerestrictions = 0;
zoning = false; zoning = false;
zone_mode = ZoneUnsolicited; zone_mode = ZoneUnsolicited;
proximity_x = FLT_MAX; //arbitrary large number
proximity_y = FLT_MAX;
proximity_z = FLT_MAX;
casting_spell_id = 0; casting_spell_id = 0;
npcflag = false; npcflag = false;
npclevel = 0; npclevel = 0;

13
zone/client.h
View File

@ -393,10 +393,10 @@ public:
inline const char* GetLastName() const { return lastname; } inline const char* GetLastName() const { return lastname; }
inline float ProximityX() const { return(proximity_x); } inline float ProximityX() const { return m_Proximity.m_X; }
inline float ProximityY() const { return(proximity_y); } inline float ProximityY() const { return m_Proximity.m_Y; }
inline float ProximityZ() const { return(proximity_z); } inline float ProximityZ() const { return m_Proximity.m_Z; }
inline void ClearAllProximities() { entity_list.ProcessMove(this, xyz_location(FLT_MAX, FLT_MAX, FLT_MAX)); proximity_x = FLT_MAX; proximity_y = FLT_MAX; proximity_z = FLT_MAX; } inline void ClearAllProximities() { entity_list.ProcessMove(this, xyz_location(FLT_MAX, FLT_MAX, FLT_MAX)); m_Proximity = xyz_location(FLT_MAX,FLT_MAX,FLT_MAX); }
/* /*
Begin client modifiers Begin client modifiers
@ -1409,10 +1409,7 @@ private:
Timer RespawnFromHoverTimer; Timer RespawnFromHoverTimer;
Timer merc_timer; Timer merc_timer;
float proximity_x; xyz_location m_Proximity;
float proximity_y;
float proximity_z;
void BulkSendInventoryItems(); void BulkSendInventoryItems();

5
zone/client_packet.cpp
View File

@ -4543,9 +4543,8 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
entity_list.ProcessMove(this, xyz_location(ppu->x_pos, ppu->y_pos, ppu->z_pos)); entity_list.ProcessMove(this, xyz_location(ppu->x_pos, ppu->y_pos, ppu->z_pos));
if(RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem,EnableTaskProximity)) if(RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem,EnableTaskProximity))
ProcessTaskProximities(ppu->x_pos, ppu->y_pos, ppu->z_pos); ProcessTaskProximities(ppu->x_pos, ppu->y_pos, ppu->z_pos);
proximity_x = ppu->x_pos;
proximity_y = ppu->y_pos; m_Proximity = xyz_location(ppu->x_pos, ppu->y_pos, ppu->z_pos);
proximity_z = ppu->z_pos;
} }
// Update internal state // Update internal state

4
zone/zoning.cpp
View File

@ -653,9 +653,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
if(zoneID == GetZoneID()) { if(zoneID == GetZoneID()) {
//properly handle proximities //properly handle proximities
entity_list.ProcessMove(this, m_Position); entity_list.ProcessMove(this, m_Position);
proximity_x = m_Position.m_X; m_Proximity = m_Position;
proximity_y = m_Position.m_Y;
proximity_z = m_Position.m_Z;
//send out updates to people in zone. //send out updates to people in zone.
SendPosition(); SendPosition();