Remove event hook threads, as it caused issues when being called from dotnet.
All checks were successful
continuous-integration/drone/push Build is passing

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
2020-08-07 20:11:03 +02:00
parent 5b1c73a2af
commit 3d21b7c42d
5 changed files with 37 additions and 31 deletions

View File

@@ -89,7 +89,6 @@ void Battle::CheckChoicesSetAndRun() {
this->_currentTurnQueue = nullptr;
}
TriggerEventListener<TurnEndEvent>();
_eventHook.FinishListening();
}
ArbUt::BorrowedPtr<ChoiceQueue> Battle::GetCurrentTurnQueue() const noexcept { return _currentTurnQueue; }

View File

@@ -95,6 +95,7 @@ namespace CreatureLib::Battling {
void RemoveVolatileScript(Script* script);
bool HasVolatileScript(const ArbUt::BasicStringView& name) const { return _volatile.Has(name); }
bool HasVolatileScript(uint32_t keyHash) const { return _volatile.Has(keyHash); }
EventHook& GetEventHook() noexcept { return _eventHook; }
const EventHook& GetEventHook() const noexcept { return _eventHook; }
void DisplayText(const ArbUt::StringView& text);