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

Migrate factions [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-11 03:22:36 -05:00
parent c98d2743c5
commit ec5be4985e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/command.cpp
View File

@ -4015,7 +4015,7 @@ void command_faction(Client *c, const Seperator *sep)
else { else {
query = fmt::format("SELECT `id`,`name` FROM `faction_list` WHERE `name` LIKE '%{}%'", faction_filter.c_str()); query = fmt::format("SELECT `id`,`name` FROM `faction_list` WHERE `name` LIKE '%{}%'", faction_filter.c_str());
} }
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) if (!results.Success())
return; return;
if (results.RowCount() == 0) { if (results.RowCount() == 0) {
@ -4048,7 +4048,7 @@ void command_faction(Client *c, const Seperator *sep)
revquery = fmt::format( revquery = fmt::format(
"SELECT id,`name`, current_value FROM faction_list INNER JOIN faction_values ON faction_list.id = faction_values.faction_id WHERE `name` like '%{}%' and char_id = {}", faction_filter.c_str(), charid); "SELECT id,`name`, current_value FROM faction_list INNER JOIN faction_values ON faction_list.id = faction_values.faction_id WHERE `name` like '%{}%' and char_id = {}", faction_filter.c_str(), charid);
} }
auto revresults = database.QueryDatabase(revquery); auto revresults = content_db.QueryDatabase(revquery);
if (!revresults.Success()) if (!revresults.Success())
return; return;
if (revresults.RowCount() == 0) { if (revresults.RowCount() == 0) {

2
zone/main.cpp
View File

@ -353,7 +353,7 @@ int main(int argc, char** argv) {
guild_mgr.LoadGuilds(); guild_mgr.LoadGuilds();
LogInfo("Loading factions"); LogInfo("Loading factions");
database.LoadFactionData(); content_db.LoadFactionData();
LogInfo("Loading titles"); LogInfo("Loading titles");
title_manager.LoadTitles(); title_manager.LoadTitles();