From 28d5c8f3018ac4b028e28d08e992bef7ab5c68fb Mon Sep 17 00:00:00 2001 From: Uleat Date: Tue, 10 Sep 2019 00:20:13 -0400 Subject: [PATCH] Fix-up after 'io_work' branch merger --- changelog.txt | 22 ---------------------- zone/zonedb.cpp | 10 +--------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/changelog.txt b/changelog.txt index 324974969..84d38df4a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,27 +1,5 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- -== 9/04/2019 == -Uleat: Added code to restore rule notes to their original values - - The code is inactive by default - - Change rule 'World:RestoreRuleNotes' to 'true' to enable this feature - - Rule will not exist until the server is run for the first time after updating - -== 9/02/2019 == -Uleat: Added code to inject new rules into the 'default' ruleset and remove orphaned rules from all rulesets - - New rules are only added using the 'default' ruleset - Other rulesets will need to be added manually or through in-game updates - -- Rule notes are now loaded into the system's hard-coded entries and will now propagate properly into database updates - - Defunct rules will have their orhpaned entries removed from the `rule_values` table for the all rulesets - -Note: If you would like to add these rules before starting your server so that you can modify them, start world.exe -manually and wait for the console messages to finish. It should take 5-10 seconds, or so. The world log should contain -a list of the added and removed entries, IF the `file` field of the 'Status' logging category is set to 1 or higher. -(Don't forget to manually stop the process after the update is complete.) - -== 8/30/2019 == -Uleat: Added code to inject new commands and remove orphaned commands from both command systems - - New commands are added with their status (`access`) set to the server default value - no aliases are defined - - Defunct commands will have their orhpaned entries removed from the command settings table for each system - == 8/16/2019 == Akkadius: Simplified the use of roamboxes and improved the AI for roambox pathing https://i.imgur.com/z33u7y9.gif Akkadius: Implemented command #roambox set [move_delay] diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 2f0a3def2..fea89efbf 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -4122,15 +4122,7 @@ bool ZoneDatabase::LoadFactionData() Log(Logs::General, Logs::Status, "%u Faction%s loaded...", faction_ids.size(), (faction_ids.size() == 1 ? "" : "s")); - // this can be removed once the 'io_work' branch has been merged - std::vector faction_id_strings; - for (auto id : faction_ids) { - faction_id_strings.push_back(fmt::format("'{}'", id)); - } - const std::string faction_id_criteria(implode(",", faction_id_strings)); - - // code to activate (note above) - //const std::string faction_id_criteria(implode(",", std::pair('\'', '\''), faction_ids)); + const std::string faction_id_criteria(implode(",", std::pair('\'', '\''), faction_ids)); // load faction mins/maxes query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria);