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

Fix all expansion enabled filtering [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-04-18 18:12:25 -05:00
parent a0f8bbb3b9
commit bcd62b76c4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/world_content_service.h
View File

@ -25,7 +25,8 @@
#include <vector> #include <vector>
namespace Expansion { namespace Expansion {
static const int EXPANSION_ALL = -1; static const int EXPANSION_ALL = -1;
static const int EXPANSION_FILTER_MAX = 99;
enum ExpansionNumber { enum ExpansionNumber {
Classic = 0, Classic = 0,

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

@ -34,17 +34,22 @@ namespace ContentFilterCriteria {
table_prefix = table_prefix + "."; table_prefix = table_prefix + ".";
} }
int current_expansion_filter_criteria = content_service.GetCurrentExpansion();
if (current_expansion_filter_criteria == Expansion::EXPANSION_ALL) {
current_expansion_filter_criteria = Expansion::EXPANSION_FILTER_MAX;
}
criteria += fmt::format( criteria += fmt::format(
" AND ({}min_expansion <= {} OR {}min_expansion = 0)", " AND ({}min_expansion <= {} OR {}min_expansion = 0)",
table_prefix, table_prefix,
content_service.GetCurrentExpansion(), current_expansion_filter_criteria,
table_prefix table_prefix
); );
criteria += fmt::format( criteria += fmt::format(
" AND ({}max_expansion >= {} OR {}max_expansion = 0)", " AND ({}max_expansion >= {} OR {}max_expansion = 0)",
table_prefix, table_prefix,
content_service.GetCurrentExpansion(), current_expansion_filter_criteria,
table_prefix table_prefix
); );