pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-05 02:52:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use column aliases for expedition request query

Browse Source
This commit is contained in:
hg 2020-10-17 23:16:20 -04:00
parent d2ad2ec078
commit 54500b0e72
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/expedition_database.h
View File

@ -97,4 +97,18 @@ namespace LoadExpeditionColumns
}; };
}; };
namespace LoadMembersForCreateRequestColumns
{
enum eLoadMembersForCreateRequestColumns
{
character_id = 0,
character_name,
character_expedition_id,
lockout_uuid,
lockout_expire_time,
lockout_duration,
lockout_event_name
};
};
#endif #endif

18
zone/expedition_request.cpp
View File

@ -221,14 +221,16 @@ bool ExpeditionRequest::CheckMembersForConflicts(const std::vector<std::string>&
bool is_solo = (member_names.size() == 1); bool is_solo = (member_names.size() == 1);
bool has_conflicts = false; bool has_conflicts = false;
using col = LoadMembersForCreateRequestColumns::eLoadMembersForCreateRequestColumns;
std::vector<ExpeditionRequestConflict> member_lockout_conflicts; std::vector<ExpeditionRequestConflict> member_lockout_conflicts;
uint32_t last_character_id = 0; uint32_t last_character_id = 0;
for (auto row = results.begin(); row != results.end(); ++row) for (auto row = results.begin(); row != results.end(); ++row)
{ {
auto character_id = static_cast<uint32_t>(std::strtoul(row[0], nullptr, 10)); uint32_t character_id = std::strtoul(row[col::character_id], nullptr, 10);
std::string character_name(row[1]); std::string character_name = row[col::character_name];
bool has_expedition = (row[2] != nullptr); // in expedition_members with another expedition bool has_expedition = (row[col::character_expedition_id] != nullptr);
if (character_id != last_character_id) if (character_id != last_character_id)
{ {
@ -258,12 +260,14 @@ bool ExpeditionRequest::CheckMembersForConflicts(const std::vector<std::string>&
last_character_id = character_id; last_character_id = character_id;
// compare member lockouts with leader lockouts // compare member lockouts with leader lockouts
if (row[3] && row[4] && row[5] && row[6]) if (row[col::lockout_uuid]) // lockout results may be null
{ {
auto expire_time = strtoull(row[4], nullptr, 10); auto expire_time = strtoull(row[col::lockout_expire_time], nullptr, 10);
auto duration = static_cast<uint32_t>(strtoul(row[5], nullptr, 10)); uint32_t duration = strtoul(row[col::lockout_duration], nullptr, 10);
ExpeditionLockoutTimer lockout{row[3], m_expedition_name, row[6], expire_time, duration}; ExpeditionLockoutTimer lockout{
row[col::lockout_uuid], m_expedition_name, row[col::lockout_event_name], expire_time, duration
};
if (!lockout.IsExpired()) if (!lockout.IsExpired())
{ {