Overhaul memory model to new Arbutils memory.

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
2020-12-12 12:22:48 +01:00
parent 1dc3aafd33
commit 5c39694f19
33 changed files with 279 additions and 211 deletions
--- a/src/Battling/TurnChoices/AttackTurnChoice.hpp
+++ b/src/Battling/TurnChoices/AttackTurnChoice.hpp
@@ -22,9 +22,9 @@ namespace CreatureLib::Battling {
            if (user == nullptr)
                return;
            auto battle = user->GetBattle();
-            if (battle != nullptr) {
+            if (battle.HasValue()) {
                if (_attack->GetAttack()->HasSecondaryEffect()) {
-                    auto library = battle->GetLibrary();
+                    auto library = battle.GetValue()->GetLibrary();
                    auto& effect = _attack->GetAttack()->GetSecondaryEffect();
                    _attackScript =
                        std::unique_ptr<Script>(library->LoadScript(ScriptCategory::Attack, effect->GetEffectName()));