summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-03-05 11:29:53 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-03-05 11:29:53 -0500
commitf9fc33aba5ff9e1c8b9b393223c711516be0384e (patch)
tree8b67baa9c2f11957db886a89d97219375378537d
parent4e7f18196bf4c638823dc254905341b560ccec49 (diff)
Simplify requestDecision
-rw-r--r--sigencore/Arena.cpp4
-rw-r--r--sigencore/Arena.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp
index c36db10d..5c3f7102 100644
--- a/sigencore/Arena.cpp
+++ b/sigencore/Arena.cpp
@@ -53,9 +53,9 @@ const int Arena::Fighters = -2;
const int Arena::AllTeams = -3;
const int Arena::NoTeam = -4;
-TeamMember::RequestedAction Sigencore::requestDecision(Player* player, TeamMember* teamMember)
+TeamMember::RequestedAction Sigencore::requestDecision(TeamMember* teamMember)
{
- return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, player, teamMember));
+ return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, teamMember->team()->player(), teamMember));
}
TeamMember::Action Sigencore::decision(Player* player, TeamMember* teamMember)
diff --git a/sigencore/Arena.h b/sigencore/Arena.h
index dfe5d2ec..8d66b965 100644
--- a/sigencore/Arena.h
+++ b/sigencore/Arena.h
@@ -142,7 +142,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config
const QUuid m_id;
};
-SIGENCORE_EXPORT TeamMember::RequestedAction requestDecision(Player* player, TeamMember* teamMember);
+SIGENCORE_EXPORT TeamMember::RequestedAction requestDecision(TeamMember* teamMember);
SIGENCORE_EXPORT TeamMember::Action decision(Player* player, TeamMember* teamMember);
}