[10322] In chat command handlers use char* arg instead "const char*"

We in any case modify args string content at parsing in commands,
so cast it to char* early. This let avoid lot later casts.

Some other code style exist in related code.
This commit is contained in:
VladimirMangos 2010-08-06 01:02:21 +04:00
parent 17ecab0030
commit 0cc1fbe697
9 changed files with 1200 additions and 1264 deletions

View file

@ -30,7 +30,7 @@
#include "revision_nr.h"
#include "Util.h"
bool ChatHandler::HandleHelpCommand(const char* args)
bool ChatHandler::HandleHelpCommand(char* args)
{
if(!*args)
{
@ -46,13 +46,13 @@ bool ChatHandler::HandleHelpCommand(const char* args)
return true;
}
bool ChatHandler::HandleCommandsCommand(const char* /*args*/)
bool ChatHandler::HandleCommandsCommand(char* /*args*/)
{
ShowHelpForCommand(getCommandTable(), "");
return true;
}
bool ChatHandler::HandleAccountCommand(const char* args)
bool ChatHandler::HandleAccountCommand(char* args)
{
// let show subcommands at unexpected data in args
if (*args)
@ -63,7 +63,7 @@ bool ChatHandler::HandleAccountCommand(const char* args)
return true;
}
bool ChatHandler::HandleStartCommand(const char* /*args*/)
bool ChatHandler::HandleStartCommand(char* /*args*/)
{
Player *chr = m_session->GetPlayer();
@ -86,7 +86,7 @@ bool ChatHandler::HandleStartCommand(const char* /*args*/)
return true;
}
bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
{
uint32 activeClientsNum = sWorld.GetActiveSessionCount();
uint32 queuedClientsNum = sWorld.GetQueuedSessionCount();
@ -110,7 +110,7 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
return true;
}
bool ChatHandler::HandleDismountCommand(const char* /*args*/)
bool ChatHandler::HandleDismountCommand(char* /*args*/)
{
//If player is not mounted, so go out :)
if (!m_session->GetPlayer( )->IsMounted())
@ -132,7 +132,7 @@ bool ChatHandler::HandleDismountCommand(const char* /*args*/)
return true;
}
bool ChatHandler::HandleSaveCommand(const char* /*args*/)
bool ChatHandler::HandleSaveCommand(char* /*args*/)
{
Player *player=m_session->GetPlayer();
@ -152,7 +152,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/)
return true;
}
bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
bool ChatHandler::HandleGMListIngameCommand(char* /*args*/)
{
std::list< std::pair<std::string, bool> > names;
@ -183,7 +183,7 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
return true;
}
bool ChatHandler::HandleAccountPasswordCommand(const char* args)
bool ChatHandler::HandleAccountPasswordCommand(char* args)
{
// allow use from RA, but not from console (not have associated account id)
if (!GetAccountId())
@ -196,7 +196,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
if(!*args)
return false;
char *old_pass = strtok ((char*)args, " ");
char *old_pass = strtok (args, " ");
char *new_pass = strtok (NULL, " ");
char *new_pass_c = strtok (NULL, " ");
@ -242,7 +242,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
return true;
}
bool ChatHandler::HandleAccountLockCommand(const char* args)
bool ChatHandler::HandleAccountLockCommand(char* args)
{
// allow use from RA, but not from console (not have associated account id)
if (!GetAccountId())
@ -258,7 +258,7 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
return true;
}
std::string argstr = (char*)args;
std::string argstr = args;
if (argstr == "on")
{
LoginDatabase.PExecute( "UPDATE account SET locked = '1' WHERE id = '%d'",GetAccountId());
@ -278,7 +278,7 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
}
/// Display the 'Message of the day' for the realm
bool ChatHandler::HandleServerMotdCommand(const char* /*args*/)
bool ChatHandler::HandleServerMotdCommand(char* /*args*/)
{
PSendSysMessage(LANG_MOTD_CURRENT, sWorld.GetMotd());
return true;