summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-07-02 19:52:49 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-07-02 19:52:49 +0200
commit15f30e40e331a095da5a6a64e29944183e8672a5 (patch)
tree99467b96eb02071aa956b953b20b399816186951 /src
parent668e1ab70b66a44e40922a29225d2835b03190fa (diff)
...
Diffstat (limited to 'src')
-rw-r--r--src/battlemap/game-logic/bm_turn_actions.erl4
-rw-r--r--src/battlemap/reply/bm_add_char.erl3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/battlemap/game-logic/bm_turn_actions.erl b/src/battlemap/game-logic/bm_turn_actions.erl
index 2dfcf63..abe80e3 100644
--- a/src/battlemap/game-logic/bm_turn_actions.erl
+++ b/src/battlemap/game-logic/bm_turn_actions.erl
@@ -43,7 +43,7 @@ handle_player_defeat (PlayerIX, Update) ->
S1Update =
lists:foldl
(
- fun (NextUpdate, IX) ->
+ fun (IX, NextUpdate) ->
bm_character_turn_update:add_to_db
(
sh_db_query:update_indexed
@@ -79,7 +79,7 @@ handle_player_defeat (PlayerIX, Update) ->
[
sh_db_query:set_field
(
- bm_character:get_is_active_field(),
+ bm_player:get_is_active_field(),
false
)
]
diff --git a/src/battlemap/reply/bm_add_char.erl b/src/battlemap/reply/bm_add_char.erl
index d37c06e..a8d905f 100644
--- a/src/battlemap/reply/bm_add_char.erl
+++ b/src/battlemap/reply/bm_add_char.erl
@@ -17,7 +17,8 @@ rank_to_string (Rank) ->
case Rank of
optional -> <<"o">>;
target -> <<"t">>;
- commander -> <<"c">>
+ commander -> <<"c">>;
+ defeated -> <<"d">>
end.
-spec attributes_as_json