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

Formatting NPC validation macro.

Browse Source
This commit is contained in:
Kinglykrab 2021-02-02 17:06:55 -05:00
parent 0923ff040f
commit 963b8fdd53
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/perl_npc.cpp
View File

@ -924,19 +924,13 @@ XS(XS_NPC_MoveTo) {
float mtx = (float) SvNV(ST(1)); float mtx = (float) SvNV(ST(1));
float mty = (float) SvNV(ST(2)); float mty = (float) SvNV(ST(2));
float mtz = (float) SvNV(ST(3)); float mtz = (float) SvNV(ST(3));
float mth; float mth = 0;
bool saveguard; bool saveguard = false;
VALIDATE_THIS_IS_NPC;
if (items > 4) if (items > 4)
mth = (float) SvNV(ST(4)); mth = (float) SvNV(ST(4));
else
mth = 0;
if (items > 5) if (items > 5)
saveguard = (bool) SvTRUE(ST(5)); saveguard = (bool) SvTRUE(ST(5));
else
saveguard = false;
VALIDATE_THIS_IS_NPC;
auto position = glm::vec4(mtx, mty, mtz, mth); auto position = glm::vec4(mtx, mty, mtz, mth);
THIS->MoveTo(position, saveguard); THIS->MoveTo(position, saveguard);
} }
@ -1064,7 +1058,6 @@ XS(XS_NPC_GetSpawnPointX) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetSpawnPoint().x; RETVAL = THIS->GetSpawnPoint().x;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1082,7 +1075,6 @@ XS(XS_NPC_GetSpawnPointY) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetSpawnPoint().y; RETVAL = THIS->GetSpawnPoint().y;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1100,7 +1092,6 @@ XS(XS_NPC_GetSpawnPointZ) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetSpawnPoint().z; RETVAL = THIS->GetSpawnPoint().z;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1118,7 +1109,6 @@ XS(XS_NPC_GetSpawnPointH) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetSpawnPoint().w; RETVAL = THIS->GetSpawnPoint().w;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1136,7 +1126,6 @@ XS(XS_NPC_GetGuardPointX) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetGuardPoint().x; RETVAL = THIS->GetGuardPoint().x;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1154,7 +1143,6 @@ XS(XS_NPC_GetGuardPointY) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetGuardPoint().y; RETVAL = THIS->GetGuardPoint().y;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);
@ -1172,7 +1160,6 @@ XS(XS_NPC_GetGuardPointZ) {
float RETVAL; float RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetGuardPoint().z; RETVAL = THIS->GetGuardPoint().z;
XSprePUSH; XSprePUSH;
PUSHn((double) RETVAL); PUSHn((double) RETVAL);