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

[Cleanup] Quest API push methods using invalid types. (#2172)

Browse Source 
* [Cleanup] Quest API push methods using invalid types.
- Some push methods were pushing integers as unsigned integers or unsigned integer as integers, this fixes all of that.
- Also cleans up some lines that had multiple function calls on them.

* More cleanup of bools and one expansion name was wrong.
This commit is contained in:
Kinglykrab 2022-05-15 22:14:16 -04:00 committed by GitHub
parent 8554aab2ff
commit 7c1a139991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 454 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/world_content_service.h
View File

@ -54,7 +54,7 @@ namespace Expansion {
VeilOfAlaris,
RainOfFear,
CallOfTheForsaken,
TheDarkendSea,
TheDarkenedSea,
TheBrokenMirror,
EmpiresOfKunark,
RingOfScale,
@ -127,7 +127,7 @@ public:
bool IsVeilOfAlarisEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::VeilOfAlaris || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsRainOfFearEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RainOfFear || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsCallOfTheForsakenEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::CallOfTheForsaken || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsTheDarkendSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheDarkendSea || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsTheDarkenedSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheDarkenedSea || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsTheBrokenMirrorEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBrokenMirror || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsEmpiresOfKunarkEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::EmpiresOfKunark || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
bool IsRingOfScaleEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RingOfScale || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
@ -155,7 +155,7 @@ public:
bool IsCurrentExpansionVeilOfAlaris() { return current_expansion == Expansion::ExpansionNumber::VeilOfAlaris; }
bool IsCurrentExpansionRainOfFear() { return current_expansion == Expansion::ExpansionNumber::RainOfFear; }
bool IsCurrentExpansionCallOfTheForsaken() { return current_expansion == Expansion::ExpansionNumber::CallOfTheForsaken; }
bool IsCurrentExpansionTheDarkendSea() { return current_expansion == Expansion::ExpansionNumber::TheDarkendSea; }
bool IsCurrentExpansionTheDarkenedSea() { return current_expansion == Expansion::ExpansionNumber::TheDarkenedSea; }
bool IsCurrentExpansionTheBrokenMirror() { return current_expansion == Expansion::ExpansionNumber::TheBrokenMirror; }
bool IsCurrentExpansionEmpiresOfKunark() { return current_expansion == Expansion::ExpansionNumber::EmpiresOfKunark; }
bool IsCurrentExpansionRingOfScale() { return current_expansion == Expansion::ExpansionNumber::RingOfScale; }

12
common/perl_eqdb.cpp
View File

@ -58,7 +58,8 @@ XS(XS_EQDB_field_count)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->field_count();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -84,7 +85,8 @@ XS(XS_EQDB_affected_rows)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->affected_rows();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -110,7 +112,8 @@ XS(XS_EQDB_insert_id)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->insert_id();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -136,7 +139,8 @@ XS(XS_EQDB_get_errno)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->get_errno();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}

6
common/perl_eqdb_res.cpp
View File

@ -54,7 +54,8 @@ XS(XS_EQDBRes_num_rows)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->num_rows();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -80,7 +81,8 @@ XS(XS_EQDBRes_num_fields)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->num_fields();
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}

544
zone/embparser_api.cpp
View File

File diff suppressed because it is too large Load Diff

12
zone/lua_general.cpp
View File

@ -1619,8 +1619,8 @@ bool lua_is_call_of_the_forsaken_enabled() {
return content_service.IsCallOfTheForsakenEnabled();
}
bool lua_is_the_darkend_sea_enabled() {
return content_service.IsTheDarkendSeaEnabled();
bool lua_is_the_darkened_sea_enabled() {
return content_service.IsTheDarkenedSeaEnabled();
}
bool lua_is_the_broken_mirror_enabled() {
@ -1727,8 +1727,8 @@ bool lua_is_current_expansion_call_of_the_forsaken() {
return content_service.IsCurrentExpansionCallOfTheForsaken();
}
bool lua_is_current_expansion_the_darkend_sea() {
return content_service.IsCurrentExpansionTheDarkendSea();
bool lua_is_current_expansion_the_darkened_sea() {
return content_service.IsCurrentExpansionTheDarkenedSea();
}
bool lua_is_current_expansion_the_broken_mirror() {
@ -4078,7 +4078,7 @@ luabind::scope lua_register_general() {
luabind::def("is_veil_of_alaris_enabled", &lua_is_veil_of_alaris_enabled),
luabind::def("is_rain_of_fear_enabled", &lua_is_rain_of_fear_enabled),
luabind::def("is_call_of_the_forsaken_enabled", &lua_is_call_of_the_forsaken_enabled),
luabind::def("is_the_darkend_sea_enabled", &lua_is_the_darkend_sea_enabled),
luabind::def("is_the_darkened_sea_enabled", &lua_is_the_darkened_sea_enabled),
luabind::def("is_the_broken_mirror_enabled", &lua_is_the_broken_mirror_enabled),
luabind::def("is_empires_of_kunark_enabled", &lua_is_empires_of_kunark_enabled),
luabind::def("is_ring_of_scale_enabled", &lua_is_ring_of_scale_enabled),
@ -4105,7 +4105,7 @@ luabind::scope lua_register_general() {
luabind::def("is_current_expansion_veil_of_alaris", &lua_is_current_expansion_veil_of_alaris),
luabind::def("is_current_expansion_rain_of_fear", &lua_is_current_expansion_rain_of_fear),
luabind::def("is_current_expansion_call_of_the_forsaken", &lua_is_current_expansion_call_of_the_forsaken),
luabind::def("is_current_expansion_the_darkend_sea", &lua_is_current_expansion_the_darkend_sea),
luabind::def("is_current_expansion_the_darkened_sea", &lua_is_current_expansion_the_darkened_sea),
luabind::def("is_current_expansion_the_broken_mirror", &lua_is_current_expansion_the_broken_mirror),
luabind::def("is_current_expansion_empires_of_kunark", &lua_is_current_expansion_empires_of_kunark),
luabind::def("is_current_expansion_ring_of_scale", &lua_is_current_expansion_ring_of_scale),

34
zone/perl_client.cpp
View File

@ -55,7 +55,7 @@ XS(XS_Client_Save) {
uint8 iCommitNow = (uint8) SvUV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->Save(iCommitNow);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -2688,7 +2688,7 @@ XS(XS_Client_DecreaseByID) {
int16 quantity = (int16) SvIV(ST(2));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->DecreaseByID(type, quantity);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -2826,7 +2826,7 @@ XS(XS_Client_UseDiscipline) {
uint32 target = (uint32) SvUV(ST(2));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->UseDiscipline(spell_id, target);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -2921,7 +2921,7 @@ XS(XS_Client_HasZoneFlag) {
uint32 zone_id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->HasZoneFlag(zone_id);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -3313,7 +3313,7 @@ XS(XS_Client_KeyRingCheck) {
uint32 item_id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->KeyRingCheck(item_id);;
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -3705,7 +3705,7 @@ XS(XS_Client_GrantAlternateAdvancementAbility) {
}
RETVAL = THIS->GrantAlternateAdvancementAbility(aa_id, points, ignore_cost);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -3810,7 +3810,7 @@ XS(XS_Client_GetSpellIDByBookSlot) {
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->GetSpellIDByBookSlot(slot_id);
XSprePUSH;
PUSHi((IV)RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}
@ -3908,7 +3908,7 @@ XS(XS_Client_IsTaskCompleted) {
int TaskID = (int) SvIV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->IsTaskCompleted(TaskID);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -3925,7 +3925,7 @@ XS(XS_Client_IsTaskActive) {
int TaskID = (int) SvIV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->IsTaskActive(TaskID);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -3943,7 +3943,7 @@ XS(XS_Client_IsTaskActivityActive) {
int ActivityID = (int) SvIV(ST(2));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->IsTaskActivityActive(TaskID, ActivityID);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4284,7 +4284,7 @@ XS(XS_Client_HasSpellScribed) {
int spell_id = (int) SvUV(ST(1));
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->HasSpellScribed(spell_id);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4661,7 +4661,7 @@ XS(XS_Client_GetMoney) {
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->GetMoney(type, subtype);
XSprePUSH;
PUSHn((uint32) RETVAL);
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -4678,7 +4678,7 @@ XS(XS_Client_GetAccountAge) {
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->GetAccountAge();
XSprePUSH;
PUSHn((int) RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}
@ -4773,7 +4773,7 @@ XS(XS_Client_GetClientMaxLevel) {
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->GetClientMaxLevel();
XSprePUSH;
PUSHu((UV)RETVAL);
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -6019,7 +6019,7 @@ XS(XS_Client_GetEnvironmentDamageModifier) {
VALIDATE_THIS_IS_CLIENT;
RETVAL = THIS->GetEnvironmentDamageModifier();
XSprePUSH;
PUSHi((IV)RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}
@ -6156,7 +6156,7 @@ XS(XS_Client_CountAugmentEquippedByID) {
VALIDATE_THIS_IS_CLIENT;
quantity = THIS->GetInv().CountAugmentEquippedByID(item_id);
XSprePUSH;
PUSHi((IV)quantity);
PUSHi((IV) quantity);
}
XSRETURN(1);
}
@ -6228,7 +6228,7 @@ XS(XS_Client_CountItemEquippedByID) {
VALIDATE_THIS_IS_CLIENT;
quantity = THIS->GetInv().CountItemEquippedByID(item_id);
XSprePUSH;
PUSHi((IV)quantity);
PUSHi((IV) quantity);
}
XSRETURN(1);
}

46
zone/perl_entity.cpp
View File

@ -40,7 +40,7 @@ XS(XS_EntityList_GetMobID) {
uint16 id = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetMobID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Mob", (void *) RETVAL);
}
XSRETURN(1);
@ -57,7 +57,7 @@ XS(XS_EntityList_GetMob) {
char *name = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetMob(name);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Mob", (void *) RETVAL);
}
XSRETURN(1);
@ -74,7 +74,7 @@ XS(XS_EntityList_GetMobByID) {
uint16 id = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetMob(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Mob", (void *) RETVAL);
}
XSRETURN(1);
@ -91,7 +91,7 @@ XS(XS_EntityList_GetMobByNpcTypeID) {
uint32 get_id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetMobByNpcTypeID(get_id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Mob", (void *) RETVAL);
}
XSRETURN(1);
@ -108,7 +108,7 @@ XS(XS_EntityList_IsMobSpawnedByNpcTypeID) {
uint32 get_id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->IsMobSpawnedByNpcTypeID(get_id);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -125,7 +125,7 @@ XS(XS_EntityList_GetNPCByID) {
uint16 id = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetNPCByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "NPC", (void *) RETVAL);
}
XSRETURN(1);
@ -142,7 +142,7 @@ XS(XS_EntityList_GetNPCByNPCTypeID) {
uint32 npc_id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetNPCByNPCTypeID(npc_id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "NPC", (void *) RETVAL);
}
XSRETURN(1);
@ -176,7 +176,7 @@ XS(XS_EntityList_GetClientByName) {
char *name = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetClientByName(name);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -193,7 +193,7 @@ XS(XS_EntityList_GetClientByAccID) {
uint32 accid = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetClientByAccID(accid);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -210,7 +210,7 @@ XS(XS_EntityList_GetClientByID) {
uint16 id = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetClientByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -227,7 +227,7 @@ XS(XS_EntityList_GetClientByCharID) {
uint32 iCharID = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetClientByCharID(iCharID);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -244,7 +244,7 @@ XS(XS_EntityList_GetClientByWID) {
uint32 iWID = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetClientByWID(iWID);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -261,7 +261,7 @@ XS(XS_EntityList_GetObjectByDBID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetObjectByDBID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Object", (void *) RETVAL);
}
XSRETURN(1);
@ -278,7 +278,7 @@ XS(XS_EntityList_GetObjectByID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetObjectByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Object", (void *) RETVAL);
}
XSRETURN(1);
@ -295,7 +295,7 @@ XS(XS_EntityList_GetDoorsByDBID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetDoorsByDBID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Doors", (void *) RETVAL);
}
XSRETURN(1);
@ -312,7 +312,7 @@ XS(XS_EntityList_GetDoorsByDoorID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetDoorsByDoorID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Doors", (void *) RETVAL);
}
XSRETURN(1);
@ -329,7 +329,7 @@ XS(XS_EntityList_GetDoorsByID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetDoorsByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Doors", (void *) RETVAL);
}
XSRETURN(1);
@ -346,7 +346,7 @@ XS(XS_EntityList_FindDoor) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->FindDoor(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Doors", (void *) RETVAL);
}
XSRETURN(1);
@ -413,7 +413,7 @@ XS(XS_EntityList_GetGroupByID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetGroupByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Group", (void *) RETVAL);
}
XSRETURN(1);
@ -430,7 +430,7 @@ XS(XS_EntityList_GetGroupByLeaderName) {
char *leader = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetGroupByLeaderName(leader);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Group", (void *) RETVAL);
}
XSRETURN(1);
@ -447,7 +447,7 @@ XS(XS_EntityList_GetRaidByID) {
uint32 id = (uint32) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetRaidByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Raid", (void *) RETVAL);
}
XSRETURN(1);
@ -514,7 +514,7 @@ XS(XS_EntityList_GetCorpseByID) {
uint16 id = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetCorpseByID(id);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Corpse", (void *) RETVAL);
}
XSRETURN(1);
@ -531,7 +531,7 @@ XS(XS_EntityList_GetCorpseByName) {
char *name = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_ENTITY;
RETVAL = THIS->GetCorpseByName(name);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Corpse", (void *) RETVAL);
}
XSRETURN(1);

2
zone/perl_groups.cpp
View File

@ -411,7 +411,7 @@ XS(XS_Group_GetMember) {
RETVAL = member->CastToClient();
}
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);

24
zone/perl_inventory.cpp
View File

@ -126,7 +126,7 @@ XS(XS_Inventory_GetBagIndex) {
VALIDATE_THIS_IS_INVENTORY;
bag_index = THIS->CalcBagIdx(slot_id);
XSprePUSH;
PUSHu((UV)bag_index);
PUSHu((UV) bag_index);
}
XSRETURN(1);
}
@ -162,7 +162,7 @@ XS(XS_Inventory_GetMaterialFromSlot) {
VALIDATE_THIS_IS_INVENTORY;
material = THIS->CalcMaterialFromSlot(slot_id);
XSprePUSH;
PUSHu((UV)material);
PUSHu((UV) material);
}
XSRETURN(1);
}
@ -180,7 +180,7 @@ XS(XS_Inventory_GetSlotByItemInst) {
VALIDATE_THIS_IS_INVENTORY;
slot_id = THIS->GetSlotByItemInst(item);
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -198,7 +198,7 @@ XS(XS_Inventory_GetSlotFromMaterial) {
VALIDATE_THIS_IS_INVENTORY;
slot_id = THIS->CalcSlotFromMaterial(material);
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -222,7 +222,7 @@ XS(XS_Inventory_GetSlotID) {
}
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -247,7 +247,7 @@ XS(XS_Inventory_HasItem) {
slot_id = THIS->HasItem(item_id, quantity, where_to_look);
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -269,7 +269,7 @@ XS(XS_Inventory_HasItemByLoreGroup) {
slot_id = THIS->HasItemByLoreGroup(loregroup, where_to_look);
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -292,7 +292,7 @@ XS(XS_Inventory_HasItemByUse) {
slot_id = THIS->HasItemByUse(item_use, quantity, where_to_look);
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -387,7 +387,7 @@ XS(XS_Inventory_PushCursor) {
slot_id = 0;
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -409,7 +409,7 @@ XS(XS_Inventory_PutItem) {
slot_id = 0;
XSprePUSH;
PUSHi((IV)slot_id);
PUSHi((IV) slot_id);
}
XSRETURN(1);
}
@ -444,7 +444,7 @@ XS(XS_Inventory_CountAugmentEquippedByID) {
VALIDATE_THIS_IS_INVENTORY;
quantity = THIS->CountAugmentEquippedByID(item_id);
XSprePUSH;
PUSHi((IV)quantity);
PUSHi((IV) quantity);
}
XSRETURN(1);
}
@ -479,7 +479,7 @@ XS(XS_Inventory_CountItemEquippedByID) {
VALIDATE_THIS_IS_INVENTORY;
quantity = THIS->CountItemEquippedByID(item_id);
XSprePUSH;
PUSHi((IV)quantity);
PUSHi((IV) quantity);
}
XSRETURN(1);
}

24
zone/perl_mob.cpp
View File

@ -956,7 +956,7 @@ XS(XS_Mob_FindBuff) {
uint16 spellid = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->FindBuff(spellid);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -1022,7 +1022,7 @@ XS(XS_Mob_FindType) {
}
RETVAL = THIS->FindType(type, bOffensive, threshold);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -2830,7 +2830,7 @@ XS(XS_Mob_IsImmuneToSpell) {
Perl_croak(aTHX_ "caster is nullptr, avoiding crash.");
RETVAL = THIS->IsImmuneToSpell(spell_id, caster);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4334,7 +4334,7 @@ XS(XS_Mob_SetAA) {
int charges = (items == 4) ? (int) SvIV(ST(3)) : 0;
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->SetAA(aa_id, points, charges);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4457,7 +4457,7 @@ XS(XS_Mob_EntityVariableExists) {
bool RETVAL;
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->EntityVariableExists(id);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4544,7 +4544,7 @@ XS(XS_Mob_CombatRange) {
Perl_croak(aTHX_ "target is nullptr, avoiding crash.");
RETVAL = THIS->CombatRange(target);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -4721,7 +4721,7 @@ XS(XS_Mob_HasNPCSpecialAtk) {
bool RETVAL;
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->HasNPCSpecialAtk(parse);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -5677,7 +5677,7 @@ XS(XS_Mob_GetBuffStatValueBySpell) {
RETVAL = THIS->GetBuffStatValueBySpell(spellid, stat);
XSprePUSH;
PUSHi((IV)RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}
@ -5697,7 +5697,7 @@ XS(XS_Mob_GetBuffStatValueBySlot) {
RETVAL = THIS->GetBuffStatValueBySlot(slot, stat);
XSprePUSH;
PUSHi((IV)RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}
@ -5858,7 +5858,7 @@ XS(XS_Mob_GetInvisibleLevel) {
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->GetInvisibleLevel();
XSprePUSH;
PUSHu((UV)RETVAL);
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -5875,7 +5875,7 @@ XS(XS_Mob_GetInvisibleUndeadLevel) {
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->GetInvisibleUndeadLevel();
XSprePUSH;
PUSHu((UV)RETVAL);
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -5910,7 +5910,7 @@ XS(XS_Mob_SeeInvisibleUndead) {
VALIDATE_THIS_IS_MOB;
RETVAL = THIS->SeeInvisibleUndead();
XSprePUSH;
PUSHu((UV)RETVAL);
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}

4
zone/perl_npc.cpp
View File

@ -1282,7 +1282,7 @@ XS(XS_NPC_GetNPCStat) {
RETVAL = THIS->GetNPCStat(identifier);
XSprePUSH;
PUSHn((double)RETVAL);
PUSHn((double) RETVAL);
}
XSRETURN(1);
}
@ -1496,7 +1496,7 @@ XS(XS_NPC_GetScore) {
VALIDATE_THIS_IS_NPC;
RETVAL = THIS->GetScore();
XSprePUSH;
PUSHi((UV) RETVAL);
PUSHi((IV) RETVAL);
}
XSRETURN(1);
}

2
zone/perl_object.cpp
View File

@ -549,7 +549,7 @@ XS(XS_Object_EntityVariableExists) {
bool RETVAL;
VALIDATE_THIS_IS_OBJECT;
RETVAL = THIS->EntityVariableExists(id);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);

12
zone/perl_perlpacket.cpp
View File

@ -317,7 +317,8 @@ XS(XS_PerlPacket_GetByte)
uint32 pos = (uint32)SvUV(ST(1));
VALIDATE_THIS_IS_PACKET;
RETVAL = THIS->GetByte(pos);
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -335,7 +336,8 @@ XS(XS_PerlPacket_GetShort)
uint32 pos = (uint32)SvUV(ST(1));
VALIDATE_THIS_IS_PACKET;
RETVAL = THIS->GetShort(pos);
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -353,7 +355,8 @@ XS(XS_PerlPacket_GetLong)
uint32 pos = (uint32)SvUV(ST(1));
VALIDATE_THIS_IS_PACKET;
RETVAL = THIS->GetLong(pos);
XSprePUSH; PUSHu((UV)RETVAL);
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
@ -371,7 +374,8 @@ XS(XS_PerlPacket_GetFloat)
uint32 pos = (uint32)SvUV(ST(1));
VALIDATE_THIS_IS_PACKET;
RETVAL = THIS->GetFloat(pos);
XSprePUSH; PUSHn((double)RETVAL);
XSprePUSH;
PUSHn((double) RETVAL);
}
XSRETURN(1);
}

2
zone/perl_player_corpse.cpp
View File

@ -434,7 +434,7 @@ XS(XS_Corpse_CanMobLoot) {
int charid = (int) SvIV(ST(1));
VALIDATE_THIS_IS_CORPSE;
RETVAL = THIS->CanPlayerLoot(charid);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);

2
zone/perl_questitem.cpp
View File

@ -95,7 +95,7 @@ XS(XS_QuestItem_IsType) {
uint32 type = (int32) SvIV(ST(1));
VALIDATE_THIS_IS_ITEM;
RETVAL = THIS->IsType((EQ::item::ItemClass) type);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);

10
zone/perl_raids.cpp
View File

@ -40,7 +40,7 @@ XS(XS_Raid_IsRaidMember) {
const char *name = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_RAID;
RETVAL = THIS->IsRaidMember(name);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -216,7 +216,7 @@ XS(XS_Raid_IsLeader) {
const char *name = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_RAID;
RETVAL = THIS->IsLeader(name);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -233,7 +233,7 @@ XS(XS_Raid_IsGroupLeader) {
const char *who = (char *) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_RAID;
RETVAL = THIS->IsGroupLeader(who);
ST(0) = boolSV(RETVAL);
ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0));
}
XSRETURN(1);
@ -284,7 +284,7 @@ XS(XS_Raid_GetClientByIndex) {
uint16 index = (uint16) SvUV(ST(1));
VALIDATE_THIS_IS_RAID;
RETVAL = THIS->GetClientByIndex(index);
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);
@ -380,7 +380,7 @@ XS(XS_Raid_GetMember) {
RETVAL = THIS->members[index].member->CastToClient();
}
ST(0) = sv_newmortal();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Client", (void *) RETVAL);
}
XSRETURN(1);