pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into getskill

Browse Source
This commit is contained in:
Alex
2020-05-19 18:50:32 -04:00
committed by GitHub
parent ceff8b8674 0c531e976b
commit 5964bcc3c4
205 changed files with 6764 additions and 6597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/perl_client.cpp
+12 -35
View File
@@ -1891,7 +1891,7 @@ XS(XS_Client_GetRawSkill) {
Client *THIS;
uint32 RETVAL;
dXSTARG;
EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1));
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -1916,7 +1916,7 @@ XS(XS_Client_HasSkill) {
{
Client *THIS;
bool RETVAL;
EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1));
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -1941,7 +1941,7 @@ XS(XS_Client_CanHaveSkill) {
{
Client *THIS;
bool RETVAL;
EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1));
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -1965,7 +1965,7 @@ XS(XS_Client_SetSkill) {
Perl_croak(aTHX_ "Usage: Client::SetSkill(THIS, int skill_id, uint16 value)");
{
Client *THIS;
EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1));
uint16 value = (uint16) SvUV(ST(2));
if (sv_derived_from(ST(0), "Client")) {
@@ -1988,7 +1988,7 @@ XS(XS_Client_AddSkill) {
Perl_croak(aTHX_ "Usage: Client::AddSkill(THIS, int skill_id, uint16 value)");
{
Client *THIS;
EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1));
uint16 value = (uint16) SvUV(ST(2));
if (sv_derived_from(ST(0), "Client")) {
@@ -2034,7 +2034,7 @@ XS(XS_Client_CheckIncreaseSkill) {
{
Client *THIS;
bool RETVAL;
EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1));
int chancemodi;
if (sv_derived_from(ST(0), "Client")) {
@@ -2090,7 +2090,7 @@ XS(XS_Client_MaxSkill) {
{
Client *THIS;
uint16 RETVAL;
EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1));
EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1));
uint16 class_ = 0;
uint16 level = 0;
dXSTARG;
@@ -3122,7 +3122,7 @@ XS(XS_Client_SummonItem) {
uint32 aug3 = 0;
uint32 aug4 = 0;
uint32 aug5 = 0;
uint16 slot_id = EQEmu::invslot::slotCursor;
uint16 slot_id = EQ::invslot::slotCursor;
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -4180,7 +4180,7 @@ XS(XS_Client_GetItemAt) {
Perl_croak(aTHX_ "Usage: Client::GetItemAt(THIS, uint32 slot)");
{
Client *THIS;
EQEmu::ItemInstance *RETVAL;
EQ::ItemInstance *RETVAL;
uint32 slot = (int32) SvIV(ST(1));
if (sv_derived_from(ST(0), "Client")) {
@@ -4205,7 +4205,7 @@ XS(XS_Client_GetAugmentAt) {
Perl_croak(aTHX_ "Usage: Client::GetAugmentAt(THIS, uint32 slot, uint32 aug_slot)");
{
Client *THIS;
EQEmu::ItemInstance *RETVAL;
EQ::ItemInstance *RETVAL;
uint32 slot = (int32) SvIV(ST(1));
uint32 aug_slot = (int32) SvIV(ST(1));
@@ -4217,7 +4217,7 @@ XS(XS_Client_GetAugmentAt) {
if (THIS == nullptr)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
EQEmu::ItemInstance *inst = THIS->GetInv().GetItem(slot);
EQ::ItemInstance *inst = THIS->GetInv().GetItem(slot);
if (inst) {
RETVAL = inst->GetAugment(aug_slot);
} else {
@@ -5405,7 +5405,7 @@ XS(XS_Client_GetItemInInventory) {
{
Client *THIS;
int16 slot_id = (int16) SvIV(ST(1));
EQEmu::ItemInstance *RETVAL = nullptr;
EQ::ItemInstance *RETVAL = nullptr;
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -5517,28 +5517,6 @@ XS(XS_Client_NotifyNewTitlesAvailable) {
XSRETURN_EMPTY;
}
XS(XS_Client_SignalClient); /* prototype to pass -Wmissing-prototypes */
XS(XS_Client_SignalClient) {
dXSARGS;
if (items != 2)
Perl_croak(aTHX_ "Usage: Client::SignalClient(THIS, uint32 data)");
{
Client *THIS;
uint32 data = (uint32) SvUV(ST(1));
if (sv_derived_from(ST(0), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
THIS = INT2PTR(Client *, tmp);
} else
Perl_croak(aTHX_ "THIS is not of type Client");
if (THIS == nullptr)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
THIS->Signal(data);
}
XSRETURN_EMPTY;
}
XS(XS_Client_AddAlternateCurrencyValue); /* prototype to pass -Wmissing-prototypes */
XS(XS_Client_AddAlternateCurrencyValue) {
dXSARGS;
@@ -6620,7 +6598,6 @@ XS(boot_Client) {
newXSproto(strcpy(buf, "SetTint"), XS_Client_SetTint, file, "$$$");
newXSproto(strcpy(buf, "SetTitleSuffix"), XS_Client_SetTitleSuffix, file, "$$;$");
newXSproto(strcpy(buf, "SetZoneFlag"), XS_Client_SetZoneFlag, file, "$$");
newXSproto(strcpy(buf, "SignalClient"), XS_Client_SignalClient, file, "$");
newXSproto(strcpy(buf, "SilentMessage"), XS_Client_SilentMessage, file, "$$");
newXSproto(strcpy(buf, "SlotConvert2"), XS_Client_SlotConvert2, file, "$$");
newXSproto(strcpy(buf, "Stand"), XS_Client_Stand, file, "$");