diff --git a/world/expedition.cpp b/world/expedition.cpp index e94c52fa6..4ed06e42a 100644 --- a/world/expedition.cpp +++ b/world/expedition.cpp @@ -274,13 +274,13 @@ std::vector ExpeditionDatabase::LoadExpeditions() if (last_expedition_id != expedition_id) { - expeditions.emplace_back(Expedition{ + expeditions.emplace_back( static_cast(strtoul(row[0], nullptr, 10)), // expedition_id static_cast(strtoul(row[1], nullptr, 10)), // dz_instance_id static_cast(strtoul(row[2], nullptr, 10)), // dz_zone_id static_cast(strtoul(row[3], nullptr, 10)), // start_time static_cast(strtoul(row[4], nullptr, 10)) // duration - }); + ); } last_expedition_id = expedition_id; diff --git a/zone/expedition.cpp b/zone/expedition.cpp index 264740af2..a955a6661 100644 --- a/zone/expedition.cpp +++ b/zone/expedition.cpp @@ -207,7 +207,7 @@ void Expedition::CacheExpeditions(MySQLRequestResult& results) current_expedition->AddInternalMember( row[col::member_name], member_id, ExpeditionMemberStatus::Offline ); - expedition_character_ids.emplace_back(std::make_pair(expedition_id, member_id)); + expedition_character_ids.emplace_back(expedition_id, member_id); } } @@ -490,7 +490,7 @@ void Expedition::AddInternalMember( if (it == m_members.end()) { - m_members.emplace_back(ExpeditionMember{character_id, char_name, status}); + m_members.emplace_back(character_id, char_name, status); } } @@ -1288,7 +1288,7 @@ void Expedition::ProcessLockoutUpdate( Client* client = client_iter.second; if (client && client->GetExpeditionID() != GetID()) { - non_members.emplace_back(ExpeditionMember{client->CharacterID(), client->GetName()}); + non_members.emplace_back(client->CharacterID(), client->GetName()); client->AddExpeditionLockout(lockout); } } diff --git a/zone/expedition_database.cpp b/zone/expedition_database.cpp index 2d77f2d04..44b7c6781 100644 --- a/zone/expedition_database.cpp +++ b/zone/expedition_database.cpp @@ -118,13 +118,13 @@ std::vector ExpeditionDatabase::LoadCharacterLockouts(ui { for (auto row = results.begin(); row != results.end(); ++row) { - lockouts.emplace_back(ExpeditionLockoutTimer{ + lockouts.emplace_back( row[0], // expedition_uuid row[1], // expedition_name row[2], // event_name strtoull(row[3], nullptr, 10), // expire_time static_cast(strtoul(row[4], nullptr, 10)) // duration - }); + ); } } @@ -157,13 +157,13 @@ std::vector ExpeditionDatabase::LoadCharacterLockouts( { for (auto row = results.begin(); row != results.end(); ++row) { - lockouts.emplace_back(ExpeditionLockoutTimer{ + lockouts.emplace_back( row[0], // expedition_uuid expedition_name, row[1], // event_name strtoull(row[2], nullptr, 10), // expire_time static_cast(strtoul(row[3], nullptr, 10)) // duration - }); + ); } } diff --git a/zone/expedition_request.cpp b/zone/expedition_request.cpp index 29a9ccb10..474c1de08 100644 --- a/zone/expedition_request.cpp +++ b/zone/expedition_request.cpp @@ -208,7 +208,7 @@ bool ExpeditionRequest::CheckMembersForConflicts(const std::vector& if (character_id != last_character_id) { // defaults to online status, if offline group members implemented this needs to change - m_members.emplace_back(ExpeditionMember{character_id, character_name}); + m_members.emplace_back(character_id, character_name); // process event lockout conflict messages from the previous character for (const auto& member_lockout : member_lockout_conflicts) @@ -257,7 +257,7 @@ bool ExpeditionRequest::CheckMembersForConflicts(const std::vector& // leader doesn't have this lockout. queue instead of messaging // now so message comes after any replay lockout messages has_conflicts = true; - member_lockout_conflicts.emplace_back(ExpeditionRequestConflict{character_name, lockout}); + member_lockout_conflicts.push_back({character_name, lockout}); } } }