veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-20 18:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #419 from liyunfan1223/fix-trigger

Browse Source 
Fix triggers bug
This commit is contained in:
Yunfan Li 2024-08-01 11:41:02 +08:00 committed by GitHub
commit 82ee478392
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/strategy/Engine.cpp
View File

@ -470,7 +470,7 @@ bool Engine::HasStrategy(std::string const name)
void Engine::ProcessTriggers(bool minimal) void Engine::ProcessTriggers(bool minimal)
{ {
// std::unordered_map<Trigger*, Event> fires; std::unordered_map<Trigger*, Event> fires;
for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++) for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
{ {
TriggerNode* node = *i; TriggerNode* node = *i;
@ -487,6 +487,9 @@ void Engine::ProcessTriggers(bool minimal)
if (!trigger) if (!trigger)
continue; continue;
if (fires.find(trigger) != fires.end())
continue;
if (testMode || trigger->needCheck()) if (testMode || trigger->needCheck())
{ {
if (minimal && node->getFirstRelevance() < 100) if (minimal && node->getFirstRelevance() < 100)
@ -500,22 +503,21 @@ void Engine::ProcessTriggers(bool minimal)
if (!event) if (!event)
continue; continue;
// fires[trigger] = event; fires[trigger] = event;
LogAction("T:%s", trigger->getName().c_str()); LogAction("T:%s", trigger->getName().c_str());
}
}
for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
{
TriggerNode* node = *i;
Trigger* trigger = node->getTrigger();
if (fires.find(trigger) == fires.end())
continue;
Event event = fires[trigger];
MultiplyAndPush(node->getHandlers(), 0.0f, false, event, "trigger"); MultiplyAndPush(node->getHandlers(), 0.0f, false, event, "trigger");
} }
}
// for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
// {
// TriggerNode* node = *i;
// Trigger* trigger = node->getTrigger();
// if (fires.find(trigger) == fires.end())
// continue;
// Event event = fires[trigger];
// }
for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++) for (std::vector<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
{ {