From c2936a893ec00c8f5d3293d0f0d15cc132a44428 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 9 Jan 2015 03:05:13 -0500 Subject: [PATCH] clang-modernize -use-auto convert for world/client.cpp --- world/client.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/world/client.cpp b/world/client.cpp index decb98f9a..01130302d 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -105,7 +105,7 @@ Client::~Client() { void Client::SendLogServer() { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_LogServer, sizeof(LogServer_Struct)); + auto outapp = new EQApplicationPacket(OP_LogServer, sizeof(LogServer_Struct)); LogServer_Struct *l=(LogServer_Struct *)outapp->pBuffer; const char *wsn=WorldConfig::get()->ShortName.c_str(); memcpy(l->worldshortname,wsn,strlen(wsn)); @@ -140,14 +140,14 @@ void Client::SendEnterWorld(std::string name) } } - EQApplicationPacket *outapp = new EQApplicationPacket(OP_EnterWorld, strlen(char_name)+1); + auto outapp = new EQApplicationPacket(OP_EnterWorld, strlen(char_name) + 1); memcpy(outapp->pBuffer,char_name,strlen(char_name)+1); QueuePacket(outapp); safe_delete(outapp); } void Client::SendExpansionInfo() { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_ExpansionInfo, sizeof(ExpansionInfo_Struct)); + auto outapp = new EQApplicationPacket(OP_ExpansionInfo, sizeof(ExpansionInfo_Struct)); ExpansionInfo_Struct *eis = (ExpansionInfo_Struct*)outapp->pBuffer; eis->Expansions = (RuleI(World, ExpansionSettings)); QueuePacket(outapp); @@ -171,7 +171,7 @@ void Client::SendCharInfo() { // Send OP_SendCharInfo - EQApplicationPacket *outapp = new EQApplicationPacket(OP_SendCharInfo, sizeof(CharacterSelect_Struct)); + auto outapp = new EQApplicationPacket(OP_SendCharInfo, sizeof(CharacterSelect_Struct)); CharacterSelect_Struct* cs = (CharacterSelect_Struct*)outapp->pBuffer; database.GetCharSelectInfo(GetAccountID(), cs, ClientVersionBit); @@ -181,7 +181,7 @@ void Client::SendCharInfo() { } void Client::SendMaxCharCreate(int max_chars) { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_SendMaxCharacters, sizeof(MaxCharacters_Struct)); + auto outapp = new EQApplicationPacket(OP_SendMaxCharacters, sizeof(MaxCharacters_Struct)); MaxCharacters_Struct* mc = (MaxCharacters_Struct*)outapp->pBuffer; mc->max_chars = max_chars; @@ -191,7 +191,7 @@ void Client::SendMaxCharCreate(int max_chars) { } void Client::SendMembership() { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_SendMembership, sizeof(Membership_Struct)); + auto outapp = new EQApplicationPacket(OP_SendMembership, sizeof(Membership_Struct)); Membership_Struct* mc = (Membership_Struct*)outapp->pBuffer; /* @@ -248,7 +248,7 @@ void Client::SendMembership() { } void Client::SendMembershipSettings() { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_SendMembershipDetails, sizeof(Membership_Details_Struct)); + auto outapp = new EQApplicationPacket(OP_SendMembershipDetails, sizeof(Membership_Details_Struct)); Membership_Details_Struct* mds = (Membership_Details_Struct*)outapp->pBuffer; mds->membership_setting_count = 66; @@ -357,7 +357,7 @@ void Client::SendMembershipSettings() { } void Client::SendPostEnterWorld() { - EQApplicationPacket *outapp = new EQApplicationPacket(OP_PostEnterWorld, 1); + auto outapp = new EQApplicationPacket(OP_PostEnterWorld, 1); outapp->size=0; QueuePacket(outapp); safe_delete(outapp); @@ -438,7 +438,7 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) { const WorldConfig *Config=WorldConfig::get(); if(Config->UpdateStats){ - ServerPacket* pack = new ServerPacket; + auto pack = new ServerPacket; pack->opcode = ServerOP_LSPlayerJoinWorld; pack->size = sizeof(ServerLSPlayerJoinWorld_Struct); pack->pBuffer = new uchar[pack->size]; @@ -609,7 +609,7 @@ bool Client::HandleCharacterCreateRequestPacket(const EQApplicationPacket *app) len += sizeof(uint32); len += sizeof(uint32); - EQApplicationPacket *outapp = new EQApplicationPacket(OP_CharacterCreateRequest, len); + auto outapp = new EQApplicationPacket(OP_CharacterCreateRequest, len); unsigned char *ptr = outapp->pBuffer; *((uint8*)ptr) = 0; ptr += sizeof(uint8); @@ -662,7 +662,7 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) { CharCreate_Struct *cc = (CharCreate_Struct*)app->pBuffer; if(OPCharCreate(char_name, cc) == false) { database.DeleteCharacter(char_name); - EQApplicationPacket *outapp = new EQApplicationPacket(OP_ApproveName, 1); + auto outapp = new EQApplicationPacket(OP_ApproveName, 1); outapp->pBuffer[0] = 0; QueuePacket(outapp); safe_delete(outapp); @@ -715,7 +715,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { } if(!pZoning && ew->return_home && !ew->tutorial) { - CharacterSelect_Struct* cs = new CharacterSelect_Struct; + auto cs = new CharacterSelect_Struct; memset(cs, 0, sizeof(CharacterSelect_Struct)); database.GetCharSelectInfo(GetAccountID(), cs, ClientVersionBit); bool home_enabled = false; @@ -745,7 +745,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { } if(!pZoning && (RuleB(World, EnableTutorialButton) && (ew->tutorial || StartInTutorial))) { - CharacterSelect_Struct* cs = new CharacterSelect_Struct; + auto cs = new CharacterSelect_Struct; memset(cs, 0, sizeof(CharacterSelect_Struct)); database.GetCharSelectInfo(GetAccountID(), cs, ClientVersionBit); bool tutorial_enabled = false; @@ -810,7 +810,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { char* leader = 0; char leaderbuf[64] = {0}; if((leader = database.GetGroupLeaderForLogin(char_name, leaderbuf)) && strlen(leader)>1){ - EQApplicationPacket* outapp3 = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); + auto outapp3 = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupJoin_Struct)); GroupJoin_Struct* gj=(GroupJoin_Struct*)outapp3->pBuffer; gj->action=8; strcpy(gj->yourname, char_name); @@ -851,7 +851,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { else ConnectionType = 'C'; - EQApplicationPacket *outapp2 = new EQApplicationPacket(OP_SetChatServer); + auto outapp2 = new EQApplicationPacket(OP_SetChatServer); char buffer[112]; const WorldConfig *Config = WorldConfig::get(); @@ -1047,7 +1047,7 @@ bool Client::Process() { if (!eqs->CheckState(ESTABLISHED)) { if(WorldConfig::get()->UpdateStats){ - ServerPacket* pack = new ServerPacket; + auto pack = new ServerPacket; pack->opcode = ServerOP_LSPlayerLeftWorld; pack->size = sizeof(ServerLSPlayerLeftWorld_Struct); pack->pBuffer = new uchar[pack->size]; @@ -1136,7 +1136,7 @@ void Client::EnterWorld(bool TryBootup) { return; } - ServerPacket* pack = new ServerPacket; + auto pack = new ServerPacket; pack->opcode = ServerOP_AcceptWorldEntrance; pack->size = sizeof(WorldToZone_Struct); pack->pBuffer = new uchar[pack->size]; @@ -1234,7 +1234,7 @@ void Client::Clearance(int8 response) } void Client::ZoneUnavail() { - EQApplicationPacket* outapp = new EQApplicationPacket(OP_ZoneUnavail, sizeof(ZoneUnavail_Struct)); + auto outapp = new EQApplicationPacket(OP_ZoneUnavail, sizeof(ZoneUnavail_Struct)); ZoneUnavail_Struct* ua = (ZoneUnavail_Struct*)outapp->pBuffer; const char* zonename = database.GetZoneName(zoneID); if (zonename)