diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index e402e1325..71affe083 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -6125,8 +6125,7 @@ XS(XS__get_expedition_lockout_by_char_id); XS(XS__get_expedition_lockout_by_char_id) { dXSARGS; if (items != 3) { - Perl_croak(aTHX_ "Usage: quest::get_expedition_lockout_by_char_id" - "(uint32 character_id, string expedition_name, string event_name)"); + Perl_croak(aTHX_ "Usage: quest::get_expedition_lockout_by_char_id(uint32 character_id, string expedition_name, string event_name)"); } uint32_t character_id = static_cast(SvUV(ST(0))); @@ -6155,8 +6154,7 @@ XS(XS__get_expedition_lockouts_by_char_id); XS(XS__get_expedition_lockouts_by_char_id) { dXSARGS; if (items != 1 && items != 2) { - Perl_croak(aTHX_ "Usage: quest::get_expedition_lockouts_by_char_id" - "(uint32 character_id [, string expedition_name])"); + Perl_croak(aTHX_ "Usage: quest::get_expedition_lockouts_by_char_id(uint32 character_id, [string expedition_name])"); } HV* hash = newHV(); // hash refcnt +1 (non-mortal, newRV_noinc to not inc) @@ -6225,8 +6223,7 @@ XS(XS__add_expedition_lockout_all_clients); XS(XS__add_expedition_lockout_all_clients) { dXSARGS; if (items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: quest::add_expedition_lockout_all_clients" - "(string expedition_name, string event_name, uint32 seconds [, string uuid])"); + Perl_croak(aTHX_ "Usage: quest::add_expedition_lockout_all_clients(string expedition_name, string event_name, uint32 seconds, [string uuid])"); } std::string expedition_name = SvPV_nolen(ST(0)); @@ -6249,8 +6246,7 @@ XS(XS__add_expedition_lockout_by_char_id); XS(XS__add_expedition_lockout_by_char_id) { dXSARGS; if (items != 4 && items != 5) { - Perl_croak(aTHX_ "Usage: quest::add_expedition_lockout_by_char_id" - "(uint32 character_id, string expedition_name, string event_name, uint32 seconds [, string uuid])"); + Perl_croak(aTHX_ "Usage: quest::add_expedition_lockout_by_char_id(uint32 character_id, string expedition_name, string event_name, uint32 seconds, [string uuid])"); } std::string uuid; @@ -6273,8 +6269,7 @@ XS(XS__remove_expedition_lockout_by_char_id); XS(XS__remove_expedition_lockout_by_char_id) { dXSARGS; if (items != 3) { - Perl_croak(aTHX_ "Usage: quest::remove_expedition_lockout_by_char_id" - "(uint32 character_id, string expedition_name, string event_name)"); + Perl_croak(aTHX_ "Usage: quest::remove_expedition_lockout_by_char_id(uint32 character_id, string expedition_name, string event_name)"); } uint32_t character_id = static_cast(SvUV(ST(0))); @@ -6290,8 +6285,7 @@ XS(XS__remove_all_expedition_lockouts_by_char_id); XS(XS__remove_all_expedition_lockouts_by_char_id) { dXSARGS; if (items != 1 && items != 2) { - Perl_croak(aTHX_ "Usage: quest::remove_expedition_lockout_by_char_id" - "(uint32 character_id [, string expedition_name])"); + Perl_croak(aTHX_ "Usage: quest::remove_expedition_lockout_by_char_id(uint32 character_id, [string expedition_name])"); } std::string expedition_name; diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index f7cb160be..5b8ed1a05 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -6777,9 +6777,7 @@ XS(XS_Client_CreateExpedition); XS(XS_Client_CreateExpedition) { dXSARGS; if (items != 7 && items != 8) { - Perl_croak(aTHX_ "Usage: Client::CreateExpedition(THIS, string zone_name, uint32 zone_version, " - "uint32 duration, string expedition_name, uint32 min_players, uint32 max_players, " - "[, bool disable_messages = false])"); + Perl_croak(aTHX_ "Usage: Client::CreateExpedition(THIS, string zone_name, uint32 zone_version, uint32 duration, string expedition_name, uint32 min_players, uint32 max_players, [bool disable_messages = false])"); } Client* THIS = nullptr; @@ -6823,7 +6821,7 @@ XS(XS_Client_GetExpeditionLockouts); XS(XS_Client_GetExpeditionLockouts) { dXSARGS; if (items != 1 && items != 2) { - Perl_croak(aTHX_ "Usage: Client::GetExpeditionLockouts(THIS [, string expedition_name])"); + Perl_croak(aTHX_ "Usage: Client::GetExpeditionLockouts(THIS, [string expedition_name])"); } Client* THIS = nullptr; @@ -6905,7 +6903,7 @@ XS(XS_Client_AddExpeditionLockout); XS(XS_Client_AddExpeditionLockout) { dXSARGS; if (items != 4 && items != 5) { - Perl_croak(aTHX_ "Usage: Client::AddExpeditionLockout(THIS, string expedition_name, string event_name, uint32 seconds [, string uuid])"); + Perl_croak(aTHX_ "Usage: Client::AddExpeditionLockout(THIS, string expedition_name, string event_name, uint32 seconds, [string uuid])"); } Client* THIS = nullptr; @@ -6930,7 +6928,7 @@ XS(XS_Client_AddExpeditionLockoutDuration); XS(XS_Client_AddExpeditionLockoutDuration) { dXSARGS; if (items != 4 && items != 5) { - Perl_croak(aTHX_ "Usage: Client::AddExpeditionLockoutDuration(THIS, string expedition_name, string event_name, int seconds [, string uuid])"); + Perl_croak(aTHX_ "Usage: Client::AddExpeditionLockoutDuration(THIS, string expedition_name, string event_name, int seconds, [string uuid])"); } Client* THIS = nullptr; @@ -6955,7 +6953,7 @@ XS(XS_Client_RemoveAllExpeditionLockouts); XS(XS_Client_RemoveAllExpeditionLockouts) { dXSARGS; if (items != 1 && items != 2) { - Perl_croak(aTHX_ "Usage: Client::RemoveAllExpeditionLockouts(THIS [, string expedition_name])"); + Perl_croak(aTHX_ "Usage: Client::RemoveAllExpeditionLockouts(THIS, [string expedition_name])"); } Client* THIS = nullptr; @@ -7013,8 +7011,7 @@ XS(XS_Client_MovePCDynamicZone); XS(XS_Client_MovePCDynamicZone) { dXSARGS; if (items != 2 && items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Client::MovePCDynamicZone(THIS, uint32 zone_id [, int zone_version = -1, bool message_if_invalid = true])\n" - "Usage: Client::MovePCDynamicZone(THIS, string zone_name [, int zone_version = -1, bool message_if_invalid = true])"); + Perl_croak(aTHX_ "Usage: Client::MovePCDynamicZone(THIS, uint32 zone_id | string zone_name, [int zone_version = -1], [bool message_if_invalid = true])"); } Client* THIS = nullptr; diff --git a/zone/perl_expedition.cpp b/zone/perl_expedition.cpp index 5a90ee5e3..e7e0f3bb2 100644 --- a/zone/perl_expedition.cpp +++ b/zone/perl_expedition.cpp @@ -70,7 +70,7 @@ XS(XS_Expedition_AddLockoutDuration); XS(XS_Expedition_AddLockoutDuration) { dXSARGS; if (items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Expedition::AddLockout(THIS, string event_name, int seconds [, bool members_only = true])"); + Perl_croak(aTHX_ "Usage: Expedition::AddLockout(THIS, string event_name, int seconds, [bool members_only = true])"); } Expedition* THIS = nullptr; @@ -112,7 +112,7 @@ XS(XS_Expedition_AddReplayLockoutDuration); XS(XS_Expedition_AddReplayLockoutDuration) { dXSARGS; if (items != 2 && items != 3) { - Perl_croak(aTHX_ "Usage: Expedition::AddReplayLockoutDuration(THIS, int seconds [, bool members_only = true])"); + Perl_croak(aTHX_ "Usage: Expedition::AddReplayLockoutDuration(THIS, int seconds, [bool members_only = true])"); } Expedition* THIS = nullptr; @@ -406,7 +406,7 @@ XS(XS_Expedition_SetCompass); XS(XS_Expedition_SetCompass) { dXSARGS; if (items != 5) { - Perl_croak(aTHX_ "Usage: Expedition::SetCompass(THIS, uint32 zone_id|string zone_name, float x, float y, float z)"); + Perl_croak(aTHX_ "Usage: Expedition::SetCompass(THIS, uint32 zone_id | string zone_name, float x, float y, float z)"); } Expedition* THIS = nullptr; @@ -438,7 +438,7 @@ XS(XS_Expedition_SetLocked); XS(XS_Expedition_SetLocked) { dXSARGS; if (items != 2 && items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Expedition::SetLocked(THIS, bool locked [, int lock_msg = 0, uint32 color = 15])"); + Perl_croak(aTHX_ "Usage: Expedition::SetLocked(THIS, bool locked, [int lock_msg = 0], [uint32 color = 15])"); } Expedition* THIS = nullptr; @@ -515,7 +515,7 @@ XS(XS_Expedition_SetSafeReturn); XS(XS_Expedition_SetSafeReturn) { dXSARGS; if (items != 6) { - Perl_croak(aTHX_ "Usage: Expedition::SetSafeReturn(THIS, uint32 zone_id|string zone_name, float x, float y, float z, float heading)"); + Perl_croak(aTHX_ "Usage: Expedition::SetSafeReturn(THIS, uint32 zone_id | string zone_name, float x, float y, float z, float heading)"); } Expedition* THIS = nullptr; @@ -584,7 +584,7 @@ XS(XS_Expedition_UpdateLockoutDuration); XS(XS_Expedition_UpdateLockoutDuration) { dXSARGS; if (items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Expedition::UpdateLockoutDuration(THIS, string event_name, uint32 seconds [, bool members_only])"); + Perl_croak(aTHX_ "Usage: Expedition::UpdateLockoutDuration(THIS, string event_name, uint32 seconds, [bool members_only = true])"); } Expedition* THIS = nullptr; diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index adac6ddae..c663ce0ea 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -580,7 +580,7 @@ XS(XS_Group_DoesAnyMemberHaveExpeditionLockout); XS(XS_Group_DoesAnyMemberHaveExpeditionLockout) { dXSARGS; if (items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Group::DoesAnyMemberHaveExpeditionLockout(THIS, string expedition_name, string event_name [, int max_check_count = 0])"); + Perl_croak(aTHX_ "Usage: Group::DoesAnyMemberHaveExpeditionLockout(THIS, string expedition_name, string event_name, [int max_check_count = 0])"); } Group* THIS = nullptr; diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp index 2c2d8ff3c..5a7c80c1c 100644 --- a/zone/perl_raids.cpp +++ b/zone/perl_raids.cpp @@ -549,7 +549,7 @@ XS(XS_Raid_DoesAnyMemberHaveExpeditionLockout); XS(XS_Raid_DoesAnyMemberHaveExpeditionLockout) { dXSARGS; if (items != 3 && items != 4) { - Perl_croak(aTHX_ "Usage: Raid::DoesAnyMemberHaveExpeditionLockout(THIS, string expedition_name, string event_name [, int max_check_count = 0])"); + Perl_croak(aTHX_ "Usage: Raid::DoesAnyMemberHaveExpeditionLockout(THIS, string expedition_name, string event_name, [int max_check_count = 0])"); } Raid* THIS = nullptr;