filter traps [skip ci]

This commit is contained in:
Akkadius 2020-04-05 19:45:45 -05:00
parent 91c874a310
commit 9aac84a405

View File

@ -24,6 +24,7 @@
#include "entity.h" #include "entity.h"
#include "mob.h" #include "mob.h"
#include "trap.h" #include "trap.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
/* /*
@ -399,9 +400,14 @@ void EntityList::ClearTrapPointers()
bool ZoneDatabase::LoadTraps(const char* zonename, int16 version) { bool ZoneDatabase::LoadTraps(const char* zonename, int16 version) {
std::string query = StringFormat("SELECT id, x, y, z, effect, effectvalue, effectvalue2, skill, " std::string query = StringFormat(
"SELECT id, x, y, z, effect, effectvalue, effectvalue2, skill, "
"maxzdiff, radius, chance, message, respawn_time, respawn_var, level, " "maxzdiff, radius, chance, message, respawn_time, respawn_var, level, "
"`group`, triggered_number, despawn_when_triggered, undetectable FROM traps WHERE zone='%s' AND version=%u", zonename, version); "`group`, triggered_number, despawn_when_triggered, undetectable FROM traps WHERE zone='%s' AND version=%u %s",
zonename,
version,
ContentFilterCriteria::apply().c_str()
);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {