pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-modernize -use-auto convert for world/console.cpp

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-09 03:05:13 -05:00
parent 81a48cac6c
commit 0ed10ec102
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
world/console.cpp
View File

@ -114,7 +114,8 @@ bool Console::SendChannelMessage(const ServerChannelMessage_Struct* scm) {
} }
case 7: { case 7: {
SendMessage(1, "[%s] tells you, '%s'", scm->from, scm->message); SendMessage(1, "[%s] tells you, '%s'", scm->from, scm->message);
ServerPacket* pack = new ServerPacket(ServerOP_ChannelMessage, sizeof(ServerChannelMessage_Struct) + strlen(scm->message) + 1); auto pack = new ServerPacket(ServerOP_ChannelMessage,
sizeof(ServerChannelMessage_Struct) + strlen(scm->message) + 1);
memcpy(pack->pBuffer, scm, pack->size); memcpy(pack->pBuffer, scm, pack->size);
ServerChannelMessage_Struct* scm2 = (ServerChannelMessage_Struct*) pack->pBuffer; ServerChannelMessage_Struct* scm2 = (ServerChannelMessage_Struct*) pack->pBuffer;
strcpy(scm2->deliverto, scm2->from); strcpy(scm2->deliverto, scm2->from);
@ -241,7 +242,7 @@ bool Console::Process() {
struct in_addr in; struct in_addr in;
in.s_addr = GetIP(); in.s_addr = GetIP();
if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeZone) { if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeZone) {
ZoneServer* zs = new ZoneServer(tcpc); auto zs = new ZoneServer(tcpc);
_log(WORLD__CONSOLE,"New zoneserver #%d from %s:%d", zs->GetID(), inet_ntoa(in), GetPort()); _log(WORLD__CONSOLE,"New zoneserver #%d from %s:%d", zs->GetID(), inet_ntoa(in), GetPort());
zoneserver_list.Add(zs); zoneserver_list.Add(zs);
numzones++; numzones++;
@ -477,7 +478,8 @@ void Console::ProcessCommand(const char* command) {
else if (strcasecmp(sep.arg[0], "signalcharbyname") == 0) { else if (strcasecmp(sep.arg[0], "signalcharbyname") == 0) {
SendMessage(1, "Signal Sent to %s with ID %i", (char*) sep.arg[1], atoi(sep.arg[2])); SendMessage(1, "Signal Sent to %s with ID %i", (char*) sep.arg[1], atoi(sep.arg[2]));
uint32 message_len = strlen((char*) sep.arg[1]) + 1; uint32 message_len = strlen((char*) sep.arg[1]) + 1;
ServerPacket* pack = new ServerPacket(ServerOP_CZSignalClientByName, sizeof(CZClientSignalByName_Struct) + message_len); auto pack = new ServerPacket(ServerOP_CZSignalClientByName,
sizeof(CZClientSignalByName_Struct) + message_len);
CZClientSignalByName_Struct* CZSC = (CZClientSignalByName_Struct*) pack->pBuffer; CZClientSignalByName_Struct* CZSC = (CZClientSignalByName_Struct*) pack->pBuffer;
strn0cpy(CZSC->Name, (char*) sep.arg[1], 64); strn0cpy(CZSC->Name, (char*) sep.arg[1], 64);
CZSC->data = atoi(sep.arg[2]); CZSC->data = atoi(sep.arg[2]);
@ -503,7 +505,7 @@ void Console::ProcessCommand(const char* command) {
} }
else if (strcasecmp(sep.arg[0], "uptime") == 0) { else if (strcasecmp(sep.arg[0], "uptime") == 0) {
if (sep.IsNumber(1) && atoi(sep.arg[1]) > 0) { if (sep.IsNumber(1) && atoi(sep.arg[1]) > 0) {
ServerPacket* pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct)); auto pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct));
ServerUptime_Struct* sus = (ServerUptime_Struct*) pack->pBuffer; ServerUptime_Struct* sus = (ServerUptime_Struct*) pack->pBuffer;
snprintf(sus->adminname, sizeof(sus->adminname), "*%s", this->GetName()); snprintf(sus->adminname, sizeof(sus->adminname), "*%s", this->GetName());
sus->zoneserverid = atoi(sep.arg[1]); sus->zoneserverid = atoi(sep.arg[1]);
@ -628,7 +630,7 @@ void Console::ProcessCommand(const char* command) {
char tmpname[64]; char tmpname[64];
tmpname[0] = '*'; tmpname[0] = '*';
strcpy(&tmpname[1], paccountname); strcpy(&tmpname[1], paccountname);
ServerPacket* pack = new ServerPacket; auto pack = new ServerPacket;
pack->opcode = ServerOP_KickPlayer; pack->opcode = ServerOP_KickPlayer;
pack->size = sizeof(ServerKickPlayer_Struct); pack->size = sizeof(ServerKickPlayer_Struct);
pack->pBuffer = new uchar[pack->size]; pack->pBuffer = new uchar[pack->size];
@ -640,7 +642,7 @@ void Console::ProcessCommand(const char* command) {
delete pack; delete pack;
} }
else if (strcasecmp(sep.arg[0], "who") == 0) { else if (strcasecmp(sep.arg[0], "who") == 0) {
Who_All_Struct* whom = new Who_All_Struct; auto whom = new Who_All_Struct;
memset(whom, 0, sizeof(Who_All_Struct)); memset(whom, 0, sizeof(Who_All_Struct));
whom->lvllow = 0xFFFF; whom->lvllow = 0xFFFF;
whom->lvlhigh = 0xFFFF; whom->lvlhigh = 0xFFFF;
@ -681,7 +683,7 @@ void Console::ProcessCommand(const char* command) {
tmpname[0] = '*'; tmpname[0] = '*';
strcpy(&tmpname[1], paccountname); strcpy(&tmpname[1], paccountname);
ServerPacket* pack = new ServerPacket; auto pack = new ServerPacket;
pack->size = sizeof(ServerZoneStateChange_struct); pack->size = sizeof(ServerZoneStateChange_struct);
pack->pBuffer = new uchar[pack->size]; pack->pBuffer = new uchar[pack->size];
memset(pack->pBuffer, 0, sizeof(ServerZoneStateChange_struct)); memset(pack->pBuffer, 0, sizeof(ServerZoneStateChange_struct));
@ -841,7 +843,7 @@ void Console::ProcessCommand(const char* command) {
else if (strcasecmp(sep.arg[0], "reloadworld") == 0 && admin > 101) else if (strcasecmp(sep.arg[0], "reloadworld") == 0 && admin > 101)
{ {
SendEmoteMessage(0,0,0,15,"Reloading World..."); SendEmoteMessage(0,0,0,15,"Reloading World...");
ServerPacket* pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct)); auto pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct));
ReloadWorld_Struct* RW = (ReloadWorld_Struct*) pack->pBuffer; ReloadWorld_Struct* RW = (ReloadWorld_Struct*) pack->pBuffer;
RW->Option = 1; RW->Option = 1;
zoneserver_list.SendPacket(pack); zoneserver_list.SendPacket(pack);