mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-22 15:48:22 +00:00
Merge branch 'master' of https://github.com/neckkola/Server
This commit is contained in:
@@ -28,6 +28,9 @@ public:
|
||||
int isgroupleader;
|
||||
int israidleader;
|
||||
int islooter;
|
||||
#ifdef BOTS
|
||||
int isbot;
|
||||
#endif
|
||||
};
|
||||
|
||||
static std::string PrimaryKey()
|
||||
@@ -47,6 +50,9 @@ public:
|
||||
"isgroupleader",
|
||||
"israidleader",
|
||||
"islooter",
|
||||
#ifdef BOTS
|
||||
"isbot",
|
||||
#endif
|
||||
};
|
||||
}
|
||||
|
||||
@@ -111,6 +117,9 @@ public:
|
||||
entry.isgroupleader = 0;
|
||||
entry.israidleader = 0;
|
||||
entry.islooter = 0;
|
||||
#ifdef BOTS
|
||||
entry.isbot = 0;
|
||||
#endif
|
||||
|
||||
return entry;
|
||||
}
|
||||
@@ -154,7 +163,10 @@ public:
|
||||
entry.name = row[5] ? row[5] : "";
|
||||
entry.isgroupleader = atoi(row[6]);
|
||||
entry.israidleader = atoi(row[7]);
|
||||
entry.islooter = atoi(row[8]);
|
||||
entry.islooter = atoi(row[8]);
|
||||
#ifdef BOTS
|
||||
entry.isbot = atoi(row[9]);
|
||||
#endif
|
||||
|
||||
return entry;
|
||||
}
|
||||
@@ -197,6 +209,9 @@ public:
|
||||
update_values.push_back(columns[6] + " = " + std::to_string(raid_members_entry.isgroupleader));
|
||||
update_values.push_back(columns[7] + " = " + std::to_string(raid_members_entry.israidleader));
|
||||
update_values.push_back(columns[8] + " = " + std::to_string(raid_members_entry.islooter));
|
||||
#ifdef BOTS
|
||||
update_values.push_back(columns[9] + " = " + std::to_string(raid_members_entry.isbot));
|
||||
#endif
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
@@ -227,7 +242,9 @@ public:
|
||||
insert_values.push_back(std::to_string(raid_members_entry.isgroupleader));
|
||||
insert_values.push_back(std::to_string(raid_members_entry.israidleader));
|
||||
insert_values.push_back(std::to_string(raid_members_entry.islooter));
|
||||
|
||||
#ifdef BOTS
|
||||
insert_values.push_back(std::to_string(raid_members_entry.isbot));
|
||||
#endif
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
@@ -265,7 +282,9 @@ public:
|
||||
insert_values.push_back(std::to_string(raid_members_entry.isgroupleader));
|
||||
insert_values.push_back(std::to_string(raid_members_entry.israidleader));
|
||||
insert_values.push_back(std::to_string(raid_members_entry.islooter));
|
||||
|
||||
#ifdef BOTS
|
||||
insert_values.push_back(std::to_string(raid_members_entry.isbot));
|
||||
#endif
|
||||
insert_chunks.push_back("(" + implode(",", insert_values) + ")");
|
||||
}
|
||||
|
||||
@@ -307,7 +326,9 @@ public:
|
||||
entry.isgroupleader = atoi(row[6]);
|
||||
entry.israidleader = atoi(row[7]);
|
||||
entry.islooter = atoi(row[8]);
|
||||
|
||||
#ifdef BOTS
|
||||
entry.isbot = atoi(row[9]);
|
||||
#endif
|
||||
all_entries.push_back(entry);
|
||||
}
|
||||
|
||||
@@ -340,7 +361,9 @@ public:
|
||||
entry.isgroupleader = atoi(row[6]);
|
||||
entry.israidleader = atoi(row[7]);
|
||||
entry.islooter = atoi(row[8]);
|
||||
|
||||
#ifdef BOTS
|
||||
entry.isbot = atoi(row[9]);
|
||||
#endif
|
||||
all_entries.push_back(entry);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user