pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 05:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #29 from addtheice/master

Browse Source 
consts on char*'s to remove the deprecation of const string to char* warning
This commit is contained in:
Derision 2013-03-09 11:55:11 -08:00
commit 64c53fe37b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/client.cpp
View File

@ -7032,7 +7032,7 @@ void Client::SetMaxXTargets(uint8 NewMax)
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
} }
char* Client::GetRacePlural(Client* client) { const char* Client::GetRacePlural(Client* client) {
switch (client->CastToMob()->GetRace()) { switch (client->CastToMob()->GetRace()) {
case HUMAN: 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()) { switch (client->CastToMob()->GetClass()) {
case WARRIOR: case WARRIOR:

4
zone/client.h
View File

@ -1124,8 +1124,8 @@ public:
void UpdateMercLevel(); void UpdateMercLevel();
void CheckMercSuspendTimer(); void CheckMercSuspendTimer();
Timer GetMercTimer() { return merc_timer; }; Timer GetMercTimer() { return merc_timer; };
char* GetRacePlural(Client* client); const char* GetRacePlural(Client* client);
char* GetClassPlural(Client* client); const char* GetClassPlural(Client* client);
void SendWebLink(const char* website); void SendWebLink(const char* website);
bool StoreTurnInItems(Mob* with); bool StoreTurnInItems(Mob* with);

6
zone/command.cpp
View File

@ -3919,7 +3919,7 @@ void command_fixmob(Client *c, const Seperator *sep)
uint32 DrakkinTattoo = target->GetDrakkinTattoo(); uint32 DrakkinTattoo = target->GetDrakkinTattoo();
uint32 DrakkinDetails = target->GetDrakkinDetails(); 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; uint32 ChangeSetting;
char* command = sep->arg[1]; 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. // 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)) if ((!sep) || (sep->argnum == 0))
{ {
// Crash Suppressant: Shouldn't be able to get here, either, but fail gracefully if we do. // Crash Suppressant: Shouldn't be able to get here, either, but fail gracefully if we do.

6
zone/perl_perlpacket.cpp
View File

@ -47,9 +47,9 @@ XS(XS_PerlPacket_new)
if (items < 1 || items > 3) if (items < 1 || items > 3)
Perl_croak(aTHX_ "Usage: PerlPacket::new(CLASS, opcode= \"OP_Unknown\", len= 0)"); Perl_croak(aTHX_ "Usage: PerlPacket::new(CLASS, opcode= \"OP_Unknown\", len= 0)");
{ {
char * CLASS = (char *)SvPV_nolen(ST(0)); char *CLASS = (char *)SvPV_nolen(ST(0));
PerlPacket * RETVAL; PerlPacket *RETVAL;
char * opcode; const char *opcode;
uint32 len; uint32 len;
if (items < 2) if (items < 2)