summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-12-21 17:23:56 +0100
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-12-21 17:23:56 +0100
commita81ff643a823dde57ebd0ed5da8a91fb75d32267 (patch)
treedc7dd9e17bb380d05d446b10e7630db340c5998e /src/battle/struct/btl_player_turn.erl
parentc69fe90821bba84c70b020a2504fe4ed63072158 (diff)
Removes any use of arrays.
Diffstat (limited to 'src/battle/struct/btl_player_turn.erl')
-rw-r--r--src/battle/struct/btl_player_turn.erl13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/battle/struct/btl_player_turn.erl b/src/battle/struct/btl_player_turn.erl
index e0665f4..6bd823f 100644
--- a/src/battle/struct/btl_player_turn.erl
+++ b/src/battle/struct/btl_player_turn.erl
@@ -43,14 +43,14 @@
-spec next_valid_player
(
non_neg_integer(),
- array:array(btl_player:type()),
+ orddict:orddict(non_neg_integer(), btl_player:type()),
non_neg_integer(),
non_neg_integer()
) -> non_neg_integer().
next_valid_player (StartingPoint, _Players, _PlayersCount, StartingPoint) ->
StartingPoint;
next_valid_player (CandidateIX, Players, PlayersCount, StartingPoint) ->
- Candidate = array:get(CandidateIX, Players),
+ Candidate = orddict:fetch(CandidateIX, Players),
case btl_player:get_is_active(Candidate) of
true -> CandidateIX;
@@ -82,11 +82,16 @@ get_number (PlayerTurn) -> PlayerTurn#player_turn.number.
-spec get_player_ix (type()) -> non_neg_integer().
get_player_ix (PlayerTurn) -> PlayerTurn#player_turn.player_ix.
--spec next (array:array(btl_player:type()), type()) -> type().
+-spec next
+ (
+ orddict:orddict(non_neg_integer(), btl_player:type()),
+ type()
+ )
+ -> type().
next (Players, CurrentPlayerTurn) ->
CurrentPlayerIX = CurrentPlayerTurn#player_turn.player_ix,
CurrentTurnNumber = CurrentPlayerTurn#player_turn.number,
- PlayersCount = array:size(Players),
+ PlayersCount = orddict:size(Players),
NextPlayerIX =
next_valid_player