pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expansion filtering for doors

Browse Source
This commit is contained in:
Akkadius 2020-04-04 05:51:21 -05:00
parent c1e58673b2
commit 8a711f3c64
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/repositories/criteria/content_filter_criteria.h
View File

@ -31,23 +31,28 @@ namespace ContentFilterCriteria {
std::string criteria; std::string criteria;
criteria += fmt::format( criteria += fmt::format(
" AND (min_expansion >= {} OR min_expansion = 0)", " AND (min_expansion <= {} OR min_expansion = 0)",
content_service.GetCurrentExpansion() content_service.GetCurrentExpansion()
); );
criteria += fmt::format( criteria += fmt::format(
" AND (max_expansion <= {} OR max_expansion = 0)", " AND (max_expansion >= {} OR max_expansion = 0)",
content_service.GetCurrentExpansion() content_service.GetCurrentExpansion()
); );
std::vector<std::string> flags = content_service.GetContentFlags(); std::vector<std::string> flags = content_service.GetContentFlags();
for (auto &flag: flags) { for (auto &flag: flags) {
flag = "'" + flag + "'"; flag = "'" + flag + "'";
} }
std::string flags_in_filter;
if (!flags.empty()) {
flags_in_filter = fmt::format("OR content_flags IN ({})", implode(", ", flags));
}
criteria += fmt::format( criteria += fmt::format(
" AND (content_flags IS NULL OR content_flags IN ({}))", " AND (content_flags IS NULL {})",
implode(", ", flags) flags_in_filter
); );
return std::string(criteria); return std::string(criteria);

5
zone/doors.cpp
View File

@ -28,6 +28,7 @@
#include "string_ids.h" #include "string_ids.h"
#include "worldserver.h" #include "worldserver.h"
#include "zonedb.h" #include "zonedb.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
#include <iostream> #include <iostream>
#include <string.h> #include <string.h>
@ -716,10 +717,12 @@ bool ZoneDatabase::LoadDoors(int32 door_count, Door *into, const char *zone_name
" WHERE " " WHERE "
" zone = '%s' " " zone = '%s' "
" AND ( version = % u OR version = - 1 ) " " AND ( version = % u OR version = - 1 ) "
" %s "
" ORDER BY " " ORDER BY "
" doorid ASC ", " doorid ASC ",
zone_name, zone_name,
version version,
ContentFilterCriteria::apply().c_str()
); );
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {