summaryrefslogtreecommitdiff
path: root/src/query
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-03-13 18:12:28 +0100
committernsensfel <SpamShield0@noot-noot.org>2018-03-13 18:12:28 +0100
commitf3868d956b17f9606e7b7321914e7c08316a062c (patch)
treeea4baa16f6a8765e01a03c05f23b5cab3ec41869 /src/query
parent68cfa3b73e6f7def9641b08c4acf2f0f96685843 (diff)
Separates original timeline from updates.
Diffstat (limited to 'src/query')
-rw-r--r--src/query/character_turn.erl7
-rw-r--r--src/query/load_state.erl2
2 files changed, 2 insertions, 7 deletions
diff --git a/src/query/character_turn.erl b/src/query/character_turn.erl
index e2b6165..81c3c1f 100644
--- a/src/query/character_turn.erl
+++ b/src/query/character_turn.erl
@@ -147,12 +147,7 @@ update_cache (Battle, Input) ->
-spec generate_reply ( list(any())) -> binary().
generate_reply (EncodedClientUpdate) ->
- jiffy:encode
- (
- [
- turn_results:generate(EncodedClientUpdate)
- ]
- ).
+ jiffy:encode([turn_results:generate(EncodedClientUpdate)]).
handle_actions (RData, Input) ->
Battle = RData#relevant_data.battle,
diff --git a/src/query/load_state.erl b/src/query/load_state.erl
index d92c091..a03a20f 100644
--- a/src/query/load_state.erl
+++ b/src/query/load_state.erl
@@ -74,7 +74,7 @@ generate_reply (QueryState, Input) ->
jiffy:encode
(
[
- turn_results:generate(battle:get_encoded_last_turns_effects(Battle)),
+ set_timeline:generate(battle:get_encoded_last_turns_effects(Battle)),
set_map:generate(battle:get_battlemap(Battle))
|
array:sparse_to_list