summaryrefslogtreecommitdiff |
diff options
author | nsensfel <SpamShield0@noot-noot.org> | 2018-03-12 13:00:59 +0100 |
---|---|---|
committer | nsensfel <SpamShield0@noot-noot.org> | 2018-03-12 13:00:59 +0100 |
commit | 11a7a03a0088b2c4b8edc394469396d54190dc53 (patch) | |
tree | 7856475136a11a60bcf4c2980adfb5624a116b33 /src/query/character_turn.erl | |
parent | 98203d4d0034dab5db72737bcfb92017a11f3245 (diff) |
Starting to work on the timeline feature.
Diffstat (limited to 'src/query/character_turn.erl')
-rw-r--r-- | src/query/character_turn.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/query/character_turn.erl b/src/query/character_turn.erl index a692be1..e796493 100644 --- a/src/query/character_turn.erl +++ b/src/query/character_turn.erl @@ -87,11 +87,11 @@ assert_character_instance_can_be_played (RData, Input) -> ( battle:get_current_player_turn(Battle) ), - CurrentPlayer = battle:get_player_id(CurrentPlayerIX, Battle), - CharacterOwner = character:get_owner_id(Character), + CurrentPlayer = battle:get_player(CurrentPlayerIX, Battle), + CharacterOwnerID = character:get_owner_id(Character), - PlayerID = CurrentPlayer, - PlayerID = CharacterOwner, + PlayerID = player:get_id(CurrentPlayer), + PlayerID = CharacterOwnerID, true = character_instance:get_is_active(CharacterInstance). |