pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-04 14:22:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-09 03:05:13 -05:00
parent 502bb6ca79
commit 28680a4695
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
world/adventure.cpp
View File

@ -67,7 +67,7 @@ void Adventure::AddPlayer(std::string character_name, bool add_client_to_instanc
void Adventure::RemovePlayer(std::string character_name) void Adventure::RemovePlayer(std::string character_name)
{ {
std::list<std::string>::iterator iter = players.begin(); auto iter = players.begin();
while(iter != players.end()) while(iter != players.end())
{ {
if((*iter).compare(character_name) == 0) if((*iter).compare(character_name) == 0)
@ -86,7 +86,7 @@ void Adventure::RemovePlayer(std::string character_name)
bool Adventure::PlayerExists(std::string character_name) bool Adventure::PlayerExists(std::string character_name)
{ {
std::list<std::string>::iterator iter = players.begin(); auto iter = players.begin();
while(iter != players.end()) while(iter != players.end())
{ {
if(character_name.compare((*iter)) == 0) if(character_name.compare((*iter)) == 0)
@ -172,7 +172,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
safe_delete(current_timer); safe_delete(current_timer);
current_timer = new Timer(adventure_template->duration * 1000); current_timer = new Timer(adventure_template->duration * 1000);
database.SetInstanceDuration(instance_id, adventure_template->duration + 60); database.SetInstanceDuration(instance_id, adventure_template->duration + 60);
ServerPacket *pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct)); auto pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct));
ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer; ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer;
ut->instance_id = instance_id; ut->instance_id = instance_id;
ut->new_duration = adventure_template->duration + 60; ut->new_duration = adventure_template->duration + 60;
@ -187,7 +187,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
safe_delete(current_timer); safe_delete(current_timer);
current_timer = new Timer(1800000); current_timer = new Timer(1800000);
database.SetInstanceDuration(instance_id, 1860); database.SetInstanceDuration(instance_id, 1860);
ServerPacket *pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct)); auto pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct));
ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer; ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer;
ut->instance_id = instance_id; ut->instance_id = instance_id;
ut->new_duration = 1860; ut->new_duration = 1860;
@ -202,7 +202,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
safe_delete(current_timer); safe_delete(current_timer);
current_timer = new Timer(1800000); current_timer = new Timer(1800000);
database.SetInstanceDuration(instance_id, 1800); database.SetInstanceDuration(instance_id, 1800);
ServerPacket *pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct)); auto pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct));
ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer; ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer;
ut->instance_id = instance_id; ut->instance_id = instance_id;
ut->new_duration = 1860; ut->new_duration = 1860;
@ -216,7 +216,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
return; return;
} }
std::list<std::string>::iterator iter = players.begin(); auto iter = players.begin();
while(iter != players.end()) while(iter != players.end())
{ {
adventure_manager.GetAdventureData((*iter).c_str()); adventure_manager.GetAdventureData((*iter).c_str());
@ -226,11 +226,11 @@ void Adventure::SetStatus(AdventureStatus new_status)
void Adventure::SendAdventureMessage(uint32 type, const char *msg) void Adventure::SendAdventureMessage(uint32 type, const char *msg)
{ {
ServerPacket *pack = new ServerPacket(ServerOP_EmoteMessage, sizeof(ServerEmoteMessage_Struct) + strlen(msg) + 1); auto pack = new ServerPacket(ServerOP_EmoteMessage, sizeof(ServerEmoteMessage_Struct) + strlen(msg) + 1);
ServerEmoteMessage_Struct *sms = (ServerEmoteMessage_Struct*)pack->pBuffer; ServerEmoteMessage_Struct *sms = (ServerEmoteMessage_Struct*)pack->pBuffer;
sms->type = type; sms->type = type;
strcpy(sms->message, msg); strcpy(sms->message, msg);
std::list<std::string>::iterator iter = players.begin(); auto iter = players.begin();
while(iter != players.end()) while(iter != players.end())
{ {
ClientListEntry *current = client_list.FindCharacter((*iter).c_str()); ClientListEntry *current = client_list.FindCharacter((*iter).c_str());
@ -284,7 +284,7 @@ void Adventure::IncrementAssassinationCount()
void Adventure::Finished(AdventureWinStatus ws) void Adventure::Finished(AdventureWinStatus ws)
{ {
std::list<std::string>::iterator iter = players.begin(); auto iter = players.begin();
while(iter != players.end()) while(iter != players.end())
{ {
ClientListEntry *current = client_list.FindCharacter((*iter).c_str()); ClientListEntry *current = client_list.FindCharacter((*iter).c_str());
@ -293,7 +293,8 @@ void Adventure::Finished(AdventureWinStatus ws)
if(current->Online() == CLE_Status_InZone) if(current->Online() == CLE_Status_InZone)
{ {
//We can send our packets only. //We can send our packets only.
ServerPacket *pack = new ServerPacket(ServerOP_AdventureFinish, sizeof(ServerAdventureFinish_Struct)); auto pack =
new ServerPacket(ServerOP_AdventureFinish, sizeof(ServerAdventureFinish_Struct));
ServerAdventureFinish_Struct *af = (ServerAdventureFinish_Struct*)pack->pBuffer; ServerAdventureFinish_Struct *af = (ServerAdventureFinish_Struct*)pack->pBuffer;
strcpy(af->player, (*iter).c_str()); strcpy(af->player, (*iter).c_str());
af->theme = GetTemplate()->theme; af->theme = GetTemplate()->theme;
@ -410,7 +411,8 @@ void Adventure::MoveCorpsesToGraveyard()
auto c_iter = charid_list.begin(); auto c_iter = charid_list.begin();
for (auto iter = dbid_list.begin(); iter != dbid_list.end(); ++iter, ++c_iter) for (auto iter = dbid_list.begin(); iter != dbid_list.end(); ++iter, ++c_iter)
{ {
ServerPacket* pack = new ServerPacket(ServerOP_DepopAllPlayersCorpses, sizeof(ServerDepopAllPlayersCorpses_Struct)); auto pack =
new ServerPacket(ServerOP_DepopAllPlayersCorpses, sizeof(ServerDepopAllPlayersCorpses_Struct));
ServerDepopAllPlayersCorpses_Struct *dpc = (ServerDepopAllPlayersCorpses_Struct*)pack->pBuffer; ServerDepopAllPlayersCorpses_Struct *dpc = (ServerDepopAllPlayersCorpses_Struct*)pack->pBuffer;
dpc->CharacterID = (*c_iter); dpc->CharacterID = (*c_iter);
dpc->InstanceID = 0; dpc->InstanceID = 0;