Skip to content

Commit baa4026

Browse files
committed
Test: Fix test not resetting on removing test strategy.
1 parent 4736161 commit baa4026

4 files changed

Lines changed: 15 additions & 1 deletion

File tree

playerbot/strategy/Action.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace ai
7272
virtual NextAction** getContinuers() { return NULL; }
7373
virtual ActionThreatType getThreatType() { return ActionThreatType::ACTION_THREAT_NONE; }
7474
void Update() {} //Nonfunctional see AiObjectContext::Update() to enable.
75-
void Reset() {}
75+
virtual void Reset() {}
7676
virtual Unit* GetTarget();
7777
virtual Value<Unit*>* GetTargetValue();
7878
virtual std::string GetTargetName() { return "self target"; }

playerbot/strategy/tests/TestAction.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace ai
1818
virtual bool isUseful() override { return true; }
1919
virtual bool isPossible() override { return bot && bot->IsAlive(); }
2020

21+
virtual void Reset() override { ctx.Reset(); }
2122
#ifdef GenerateBotHelp
2223
virtual std::string GetHelpName() { return "test"; }
2324
virtual std::string GetHelpDescription()

playerbot/strategy/tests/TestStrategy.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,14 @@ void TestStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
1111
"test ready",
1212
NextAction::array(0, new NextAction("test", 100.0f), NULL)));
1313
}
14+
15+
void TestStrategy::OnStrategyRemoved(BotState state)
16+
{
17+
AiObjectContext* context = ai->GetAiObjectContext();
18+
Action* action = context->GetAction("test");
19+
20+
if (action)
21+
{
22+
action->Reset();
23+
};
24+
}

playerbot/strategy/tests/TestStrategy.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ namespace ai
1515
virtual void InitCombatTriggers(std::list<TriggerNode*>& triggers) override { InitNonCombatTriggers(triggers); }
1616
virtual void InitDeadTriggers(std::list<TriggerNode*>& triggers) override { InitNonCombatTriggers(triggers); };
1717

18+
19+
virtual void OnStrategyRemoved(BotState state);
1820
#ifdef GenerateBotHelp
1921
virtual std::string GetHelpName() { return "test"; }
2022
virtual std::string GetHelpDescription()

0 commit comments

Comments
 (0)