From 421de60ec7e969705bef68780507f1fc384f179c Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Mon, 25 May 2020 23:33:52 +0200
Subject: Fixes some of the errors w/ wrong S_Var being used.

---
 src/battle/struct/btl_character_turn_request.erl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/battle/struct/btl_character_turn_request.erl')

diff --git a/src/battle/struct/btl_character_turn_request.erl b/src/battle/struct/btl_character_turn_request.erl
index 9f5747f..0a9fa7d 100644
--- a/src/battle/struct/btl_character_turn_request.erl
+++ b/src/battle/struct/btl_character_turn_request.erl
@@ -54,13 +54,21 @@ validate_actions (Actions) ->
    {AreValid, _LastAction} =
       lists:foldl
       (
-         fun (Action, {CurrentResult, PrevAction}) ->
+         fun (Action, {CurrentResult, PrevActionCategory}) ->
+            ActionCategory = btl_action:get_category(Action),
             {
                case CurrentResult of
-                  false -> false;
-                  true -> btl_action:can_follow(PrevAction, Action)
+                  false ->
+                     error({action, PrevActionCategory, ActionCategory}),
+                     false;
+                  true ->
+                     btl_action:can_follow
+                     (
+                        PrevActionCategory,
+                        ActionCategory
+                     )
                end,
-               Action
+               ActionCategory
             }
          end,
          {true, nothing},
-- 
cgit v1.2.3-70-g09d2