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

guard_x_saved, guard_y_saved, guard_z_saved, guard_heading_saved converted to m_GuardPointSaved

Browse Source
This commit is contained in:
Arthur Ice 2014-11-30 14:34:27 -08:00
parent 4b71d28747
commit c060723762
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/npc.cpp
View File

@ -115,7 +115,8 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float
enraged_timer(1000), enraged_timer(1000),
taunt_timer(TauntReuseTime * 1000), taunt_timer(TauntReuseTime * 1000),
m_SpawnPoint(x,y,z,heading), m_SpawnPoint(x,y,z,heading),
m_GuardPoint(-1,-1,-1,0) m_GuardPoint(-1,-1,-1,0),
m_GuardPointSaved(0,0,0,0)
{ {
//What is the point of this, since the names get mangled.. //What is the point of this, since the names get mangled..
Mob* mob = entity_list.GetMob(name); Mob* mob = entity_list.GetMob(name);
@ -346,10 +347,6 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float
reface_timer = new Timer(15000); reface_timer = new Timer(15000);
reface_timer->Disable(); reface_timer->Disable();
qGlobals = nullptr; qGlobals = nullptr;
guard_x_saved = 0;
guard_y_saved = 0;
guard_z_saved = 0;
guard_heading_saved = 0;
SetEmoteID(d->emoteid); SetEmoteID(d->emoteid);
InitializeBuffSlots(); InitializeBuffSlots();
CalcBonuses(); CalcBonuses();

2
zone/npc.h
View File

@ -474,7 +474,7 @@ protected:
int max_wp; int max_wp;
int save_wp; int save_wp;
xyz_heading m_GuardPoint; xyz_heading m_GuardPoint;
float guard_x_saved, guard_y_saved, guard_z_saved, guard_heading_saved; xyz_heading m_GuardPointSaved;
EmuAppearance guard_anim; EmuAppearance guard_anim;
float roambox_max_x; float roambox_max_x;
float roambox_max_y; float roambox_max_y;

10
zone/waypoints.cpp
View File

@ -1328,16 +1328,10 @@ int ZoneDatabase::GetHighestWaypoint(uint32 zoneid, uint32 gridid) {
void NPC::SaveGuardSpotCharm() void NPC::SaveGuardSpotCharm()
{ {
guard_x_saved = m_GuardPoint.m_X; m_GuardPointSaved = m_GuardPoint;
guard_y_saved = m_GuardPoint.m_Y;
guard_z_saved = m_GuardPoint.m_Z;
guard_heading_saved = m_GuardPoint.m_Heading;
} }
void NPC::RestoreGuardSpotCharm() void NPC::RestoreGuardSpotCharm()
{ {
m_GuardPoint.m_X = guard_x_saved; m_GuardPoint = m_GuardPointSaved;
m_GuardPoint.m_Y = guard_y_saved;
m_GuardPoint.m_Z = guard_z_saved;
m_GuardPoint.m_Heading = guard_heading_saved;
} }