diff --git a/zone/client.cpp b/zone/client.cpp index 8033367ab..155047aa6 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -7032,7 +7032,7 @@ void Client::SetMaxXTargets(uint8 NewMax) FastQueuePacket(&outapp); } -char* Client::GetRacePlural(Client* client) { +const char* Client::GetRacePlural(Client* client) { switch (client->CastToMob()->GetRace()) { case HUMAN: @@ -7072,7 +7072,7 @@ char* Client::GetRacePlural(Client* client) { } } -char* Client::GetClassPlural(Client* client) { +const char* Client::GetClassPlural(Client* client) { switch (client->CastToMob()->GetClass()) { case WARRIOR: diff --git a/zone/client.h b/zone/client.h index ed6b1db0a..219e11704 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1124,8 +1124,8 @@ public: void UpdateMercLevel(); void CheckMercSuspendTimer(); Timer GetMercTimer() { return merc_timer; }; - char* GetRacePlural(Client* client); - char* GetClassPlural(Client* client); + const char* GetRacePlural(Client* client); + const char* GetClassPlural(Client* client); void SendWebLink(const char* website); bool StoreTurnInItems(Mob* with); diff --git a/zone/command.cpp b/zone/command.cpp index d97717547..dce3257ee 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -3919,7 +3919,7 @@ void command_fixmob(Client *c, const Seperator *sep) uint32 DrakkinTattoo = target->GetDrakkinTattoo(); uint32 DrakkinDetails = target->GetDrakkinDetails(); - char* ChangeType = NULL; // If it's still NULL after processing, they didn't send a valid command + const char* ChangeType = NULL; // If it's still NULL after processing, they didn't send a valid command uint32 ChangeSetting; char* command = sep->arg[1]; @@ -9566,8 +9566,8 @@ void command_object(Client *c, const Seperator *sep) } // Save it here. We sometimes have need to refer to it in multiple places. - char* usage_string = "Usage: #object List|Add|Edit|Move|Rotate|Save|Copy|Delete|Undo"; - + const char* usage_string = "Usage: #object List|Add|Edit|Move|Rotate|Save|Copy|Delete|Undo"; + if ((!sep) || (sep->argnum == 0)) { // Crash Suppressant: Shouldn't be able to get here, either, but fail gracefully if we do. diff --git a/zone/perl_perlpacket.cpp b/zone/perl_perlpacket.cpp index cc8ec4e62..63142c68a 100644 --- a/zone/perl_perlpacket.cpp +++ b/zone/perl_perlpacket.cpp @@ -47,9 +47,9 @@ XS(XS_PerlPacket_new) if (items < 1 || items > 3) Perl_croak(aTHX_ "Usage: PerlPacket::new(CLASS, opcode= \"OP_Unknown\", len= 0)"); { - char * CLASS = (char *)SvPV_nolen(ST(0)); - PerlPacket * RETVAL; - char * opcode; + char *CLASS = (char *)SvPV_nolen(ST(0)); + PerlPacket *RETVAL; + const char *opcode; uint32 len; if (items < 2)