diff --git a/zone/client.cpp b/zone/client.cpp index ad8482b46..5f35c6916 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -3929,7 +3929,7 @@ void Client::SendPopupToClient(const char *Title, const char *Text, uint32 Popup safe_delete(outapp); } -void Client::SendFullPopup(const char *Title, const char *Text, uint32 PopupID, uint32 NegativeID, uint32 Duration, uint32 Buttons, const char *ButtonName0, const char *ButtonName1, uint32 SoundControls) { +void Client::SendFullPopup(const char *Title, const char *Text, uint32 PopupID, uint32 NegativeID, uint32 Buttons, uint32 Duration, const char *ButtonName0, const char *ButtonName1, uint32 SoundControls) { auto outapp = new EQApplicationPacket(OP_OnLevelMessage, sizeof(OnLevelMessage_Struct)); OnLevelMessage_Struct *olms = (OnLevelMessage_Struct *)outapp->pBuffer; diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 77fb0877b..622551ce0 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -6449,15 +6449,15 @@ XS(XS_Client_Popup2) { dXSARGS; if (items < 3 || items > 10) - Perl_croak(aTHX_ "Usage: Client::SendFullPopup(THIS, Title, Text, PopupID, NegativeID, Duration, Buttons, ButtonName0, ButtonName1, SoundControls)"); + Perl_croak(aTHX_ "Usage: Client::SendFullPopup(THIS, Title, Text, PopupID, NegativeID, Buttons, Duration, ButtonName0, ButtonName1, SoundControls)"); { Client * THIS; char* Title = (char *)SvPV_nolen(ST(1)); char* Text = (char *)SvPV_nolen(ST(2)); uint32 PopupID = 0; uint32 NegativeID = 0; - uint32 Duration = 0; uint32 Buttons = 0; + uint32 Duration = 0; char* ButtonName0 = 0; char* ButtonName1 = 0; uint32 SoundControls = 0; @@ -6473,14 +6473,14 @@ XS(XS_Client_Popup2) if (items > 3) { PopupID = (uint32)SvUV(ST(3)); } if (items > 4) { NegativeID = (uint32)SvUV(ST(4)); } - if (items > 5) { Duration = (uint32)SvUV(ST(5)); } - if (items > 6) { Buttons = (uint32)SvUV(ST(6)); } + if (items > 5) { Buttons = (uint32)SvUV(ST(5)); } + if (items > 6) { Duration = (uint32)SvUV(ST(6)); } if (items > 7) { ButtonName0 = (char *)SvPV_nolen(ST(7)); } if (items > 8) { ButtonName1 = (char *)SvPV_nolen(ST(8)); } if (items > 9) { SoundControls = (uint32)SvUV(ST(9)); } - THIS->SendFullPopup(Title, Text, PopupID, NegativeID, Duration, Buttons, ButtonName0, ButtonName1, SoundControls); + THIS->SendFullPopup(Title, Text, PopupID, NegativeID, Buttons, Duration, ButtonName0, ButtonName1, SoundControls); } XSRETURN_EMPTY; }