pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GetGuardPointX(), GetGuardPointY(), GetGuardPointZ(), and GetGuardPointH() replaced with GetGuardPoint()

Browse Source
This commit is contained in:
Arthur Ice 2014-11-30 15:05:50 -08:00
parent c060723762
commit f9036ddc6a
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/lua_npc.cpp
View File

@ -334,17 +334,17 @@ float Lua_NPC::GetSpawnPointH() {
float Lua_NPC::GetGuardPointX() { float Lua_NPC::GetGuardPointX() {
Lua_Safe_Call_Real(); Lua_Safe_Call_Real();
return self->GetGuardPointX(); return self->GetGuardPoint().m_X;
} }
float Lua_NPC::GetGuardPointY() { float Lua_NPC::GetGuardPointY() {
Lua_Safe_Call_Real(); Lua_Safe_Call_Real();
return self->GetGuardPointY(); return self->GetGuardPoint().m_Y;
} }
float Lua_NPC::GetGuardPointZ() { float Lua_NPC::GetGuardPointZ() {
Lua_Safe_Call_Real(); Lua_Safe_Call_Real();
return self->GetGuardPointZ(); return self->GetGuardPoint().m_Z;
} }
void Lua_NPC::SetPrimSkill(int skill_id) { void Lua_NPC::SetPrimSkill(int skill_id) {

5
zone/npc.h
View File

@ -215,10 +215,7 @@ public:
float GetSpawnPointY() const { return m_SpawnPoint.m_Y; } float GetSpawnPointY() const { return m_SpawnPoint.m_Y; }
float GetSpawnPointZ() const { return m_SpawnPoint.m_Z; } float GetSpawnPointZ() const { return m_SpawnPoint.m_Z; }
float GetSpawnPointH() const { return m_SpawnPoint.m_Heading; } float GetSpawnPointH() const { return m_SpawnPoint.m_Heading; }
float GetGuardPointX() const { return m_GuardPoint.m_X; } xyz_heading const GetGuardPoint() const { return m_GuardPoint; }
float GetGuardPointY() const { return m_GuardPoint.m_Y; }
float GetGuardPointZ() const { return m_GuardPoint.m_Z; }
float GetGuardPointH() const { return m_GuardPoint.m_Heading; }
EmuAppearance GetGuardPointAnim() const { return guard_anim; } EmuAppearance GetGuardPointAnim() const { return guard_anim; }
void SaveGuardPointAnim(EmuAppearance anim) { guard_anim = anim; } void SaveGuardPointAnim(EmuAppearance anim) { guard_anim = anim; }

6
zone/perl_npc.cpp
View File

@ -1653,7 +1653,7 @@ XS(XS_NPC_GetGuardPointX)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->GetGuardPointX(); RETVAL = THIS->GetGuardPoint().m_X;
XSprePUSH; PUSHn((double)RETVAL); XSprePUSH; PUSHn((double)RETVAL);
} }
XSRETURN(1); XSRETURN(1);
@ -1680,7 +1680,7 @@ XS(XS_NPC_GetGuardPointY)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->GetGuardPointY(); RETVAL = THIS->GetGuardPoint().m_Y;
XSprePUSH; PUSHn((double)RETVAL); XSprePUSH; PUSHn((double)RETVAL);
} }
XSRETURN(1); XSRETURN(1);
@ -1707,7 +1707,7 @@ XS(XS_NPC_GetGuardPointZ)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->GetGuardPointZ(); RETVAL = THIS->GetGuardPoint().m_Z;
XSprePUSH; PUSHn((double)RETVAL); XSprePUSH; PUSHn((double)RETVAL);
} }
XSRETURN(1); XSRETURN(1);