| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/battlemap/game-logic/bm_turn_actions.erl | 4 | ||||
| -rw-r--r-- | src/battlemap/reply/bm_add_char.erl | 3 |
3 files changed, 6 insertions, 4 deletions
@@ -12,7 +12,8 @@ WWW_DIR ?= ${CURDIR}/www LOG_DIR ?= ${CURDIR}/log ## Local only? -ERL_NAME_VS_SNAME ?= -name +#ERL_NAME_VS_SNAME ?= -name +ERL_NAME_VS_SNAME ?= -sname ## Binaries ERLC ?= erlc 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 |