Made decision requests pass th player around as well

2 files changed, 6 insertions, 6 deletions

diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp
index a62150d4..af7cc614 100644
--- a/sigencore/Arena.cpp
+++ b/sigencore/Arena.cpp
@@ -49,14 +49,14 @@ const int Sigencore::Arena::Fighters = -2;
 const int Sigencore::Arena::AllTeams = -3;
 const int Sigencore::Arena::NoTeam = -4;
 
-Sigencore::TeamMember::RequestedAction Sigencore::requestDecision(TeamMember* teamMember)
+Sigencore::TeamMember::RequestedAction Sigencore::requestDecision(Player* player, TeamMember* teamMember)
 {
-    return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, teamMember));
+    return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, player, teamMember));
 }
 
-Sigencore::TeamMember::Action Sigencore::decision(TeamMember* teamMember)
+Sigencore::TeamMember::Action Sigencore::decision(Player* player, TeamMember* teamMember)
 {
-    return teamMember->requestAction();
+    return player->requestAction(teamMember);
 }
 
 Sigencore::Arena::Arena(Sigscript::SigmodWrapper* sigmod, const bool isWild, Sigscript::Config* parent) :
diff --git a/sigencore/Arena.h b/sigencore/Arena.h
index 82a6d336..63d58cbb 100644
--- a/sigencore/Arena.h
+++ b/sigencore/Arena.h
@@ -138,8 +138,8 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config
         const QUuid m_id;
 };
 
-SIGENCORE_EXPORT TeamMember::RequestedAction requestDecision(TeamMember* teamMember);
-SIGENCORE_EXPORT TeamMember::Action decision(TeamMember* teamMember);
+SIGENCORE_EXPORT TeamMember::RequestedAction requestDecision(Player* player, TeamMember* teamMember);
+SIGENCORE_EXPORT TeamMember::Action decision(Player* player, TeamMember* teamMember);
 
 }
 Q_DECLARE_METATYPE(Sigencore::Arena*)