From 4274a44fa5b052ddbef04eb4fcaf3351ef56c59e Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Sat, 26 Jun 2021 11:26:20 +0200
Subject: [PATCH] Fixes for GCC warnings

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
---
 .gitignore                                   |  3 +--
 src/Battling/Flow/TurnHandler.cpp            | 10 ++++++----
 src/Battling/ScriptHandling/ScriptMacros.hpp |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 640f3cc..08ed7d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-/cmake-build-debug/
-/cmake-build-release/
+/cmake-build-*
 /build-release-windows/
 /.idea/
 /docs/
\ No newline at end of file
diff --git a/src/Battling/Flow/TurnHandler.cpp b/src/Battling/Flow/TurnHandler.cpp
index 62a56f7..a551207 100644
--- a/src/Battling/Flow/TurnHandler.cpp
+++ b/src/Battling/Flow/TurnHandler.cpp
@@ -78,9 +78,11 @@ void TurnHandler::ExecuteChoice(const ArbUt::BorrowedPtr<BaseTurnChoice>& choice
 #define FAIL_HANDLING(source, user, target)                                                                            \
     battle.GetValue()->TriggerEventListener<FailEvent>(user);                                                          \
     HOOK(OnFail, source, user)                                                                                         \
-    if ((target) != (void*)0) {                                                                                        \
-        HOOK(OnOpponentFail, (target), user)                                                                           \
-    }
+    HOOK(OnOpponentFail, target, user)
+
+#define FAIL_HANDLING_NO_TARGET(source, user)                                                                          \
+    battle.GetValue()->TriggerEventListener<FailEvent>(user);                                                          \
+    HOOK(OnFail, source, user)
 
 void TurnHandler::ExecuteAttackChoice(const ArbUt::BorrowedPtr<AttackTurnChoice>& choice) {
     auto battle = choice->GetUser()->GetBattle();
@@ -124,7 +126,7 @@ void TurnHandler::ExecuteAttackChoice(const ArbUt::BorrowedPtr<AttackTurnChoice>
     bool fail = false;
     HOOK(FailAttack, attack, attack, &fail);
     if (fail) {
-        FAIL_HANDLING(attack, choice->GetUser(), (ScriptSource*)nullptr);
+        FAIL_HANDLING_NO_TARGET(attack, choice->GetUser());
         return;
     }
 
diff --git a/src/Battling/ScriptHandling/ScriptMacros.hpp b/src/Battling/ScriptHandling/ScriptMacros.hpp
index b2dd1cc..bf1e563 100644
--- a/src/Battling/ScriptHandling/ScriptMacros.hpp
+++ b/src/Battling/ScriptHandling/ScriptMacros.hpp
@@ -1,7 +1,7 @@
 #define HOOK(hookName, source, ...)                                                                                    \
     {                                                                                                                  \
         try {                                                                                                          \
-            auto aggregator = source->GetScriptIterator();                                                             \
+            auto aggregator = (source)->GetScriptIterator();                                                           \
             ArbUt::BorrowedPtr<CreatureLib::Battling::BattleScript> next = (CreatureLib::Battling::BattleScript*)1;    \
             while (aggregator.GetNext(next)) {                                                                         \
                 try {                                                                                                  \