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

[Titles] Cleanup titles, title suffix, and last name methods. (#2174)

Browse Source 
* [Titles] Cleanup titles, title suffix, and last name methods.
- Use strings instead of const chars*.
- Add optional parameter to SetAATitle in Lua so you can save to the database similar to Perl.
- Cleanup #lastname command.
- Cleanup #title command.
- Cleanup #titlesuffix command.

* Update npc.cpp
This commit is contained in:
Kinglykrab
2022-05-19 20:15:44 -04:00
committed by GitHub
parent 6398381c44
commit 0e96099b3d
19 changed files with 129 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/perl_client.cpp
+33 -25
View File
@@ -1163,9 +1163,9 @@ XS(XS_Client_ChangeLastName) {
Perl_croak(aTHX_ "Usage: Client::ChangeLastName(THIS, string last_name)"); // @categories Account and Character
{
Client *THIS;
char *in_lastname = (char *) SvPV_nolen(ST(1));
std::string last_name = (std::string) SvPV_nolen(ST(1));
VALIDATE_THIS_IS_CLIENT;
THIS->ChangeLastName(in_lastname);
THIS->ChangeLastName(last_name);
}
XSRETURN_EMPTY;
}
@@ -2965,23 +2965,27 @@ XS(XS_Client_LoadZoneFlags) {
XS(XS_Client_SetAATitle); /* prototype to pass -Wmissing-prototypes */
XS(XS_Client_SetAATitle) {
dXSARGS;
if ((items < 2) || (items > 3))
if (items < 2 || items > 3)
Perl_croak(aTHX_ "Usage: Client::SetAATitle(THIS, string text, [bool save = false])"); // @categories Alternative Advancement
{
Client *THIS;
char *txt = (char *) SvPV_nolen(ST(1));
bool SaveTitle = false;
std::string title = (std::string) SvPV_nolen(ST(1));
bool save = false;
VALIDATE_THIS_IS_CLIENT;
if (strlen(txt) > 31)
Perl_croak(aTHX_ "Title must be 31 characters or less");
if (items == 3)
SaveTitle = (SvIV(ST(2)) != 0);
if (title.size() > 31) {
Perl_croak(aTHX_ "Title must be 31 characters or less.");
}
if (!SaveTitle)
THIS->SetAATitle(txt);
else
title_manager.CreateNewPlayerTitle(THIS, txt);
if (items == 3) {
save = (bool) SvTRUE(ST(2));
}
if (!save) {
THIS->SetAATitle(title);
} else {
title_manager.CreateNewPlayerTitle(THIS, title);
}
}
XSRETURN_EMPTY;
}
@@ -3023,23 +3027,27 @@ XS(XS_Client_GetClientVersionBit) {
XS(XS_Client_SetTitleSuffix);
XS(XS_Client_SetTitleSuffix) {
dXSARGS;
if ((items < 2) || (items > 3))
Perl_croak(aTHX_ "Usage: Client::SetTitleSuffix(THIS, string text, [bool save = false])"); // @categories Account and Character
if (items < 2 || items > 3)
Perl_croak(aTHX_ "Usage: Client::SetTitleSuffix(THIS, string suffix, [bool save = false])"); // @categories Account and Character
{
Client *THIS;
char *txt = (char *) SvPV_nolen(ST(1));
bool SaveSuffix = false;
std::string suffix = (std::string) SvPV_nolen(ST(1));
bool save = false;
VALIDATE_THIS_IS_CLIENT;
if (strlen(txt) > 31)
Perl_croak(aTHX_ "Title must be 31 characters or less");
if (items == 3)
SaveSuffix = (SvIV(ST(2)) != 0);
if (suffix.size() > 31) {
Perl_croak(aTHX_ "Suffix must be 31 characters or less.");
}
if (!SaveSuffix)
THIS->SetTitleSuffix(txt);
else
title_manager.CreateNewPlayerSuffix(THIS, txt);
if (items == 3) {
save = (bool) SvTRUE(ST(2));
}
if (!save) {
THIS->SetTitleSuffix(suffix);
} else {
title_manager.CreateNewPlayerSuffix(THIS, suffix);
}
}
XSRETURN_EMPTY;
}