summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/battlemap/struct')
-rw-r--r--src/battlemap/struct/bm_character_turn_update.erl20
-rw-r--r--src/battlemap/struct/bm_player.erl6
2 files changed, 21 insertions, 5 deletions
diff --git a/src/battlemap/struct/bm_character_turn_update.erl b/src/battlemap/struct/bm_character_turn_update.erl
index 078075c..1ca5d94 100644
--- a/src/battlemap/struct/bm_character_turn_update.erl
+++ b/src/battlemap/struct/bm_character_turn_update.erl
@@ -30,7 +30,7 @@
get_db/1,
set_data/2,
- add_to_timeline/2,
+ add_to_timeline/3,
add_to_db/2
]
).
@@ -64,9 +64,21 @@ get_db (Update) -> Update#type.db.
set_data (Data, Update) ->
Update#type{ data = Data}.
--spec add_to_timeline (bm_turn_result:type(), type()) -> type().
-add_to_timeline (Item, Update) ->
- Update#type{ timeline = [bm_turn_result:encode(Item)|Update#type.timeline] }.
+-spec add_to_timeline
+ (
+ bm_turn_result:type(),
+ sh_db_query:op(),
+ type()
+ ) -> type().
+add_to_timeline (Item, DBUpdate, Update) ->
+ add_to_db
+ (
+ DBUpdate,
+ Update#type
+ {
+ timeline = [bm_turn_result:encode(Item)|Update#type.timeline]
+ }
+ ).
-spec add_to_db (sh_db_query:op(), type()) -> type().
add_to_db (Item, Update) ->
diff --git a/src/battlemap/struct/bm_player.erl b/src/battlemap/struct/bm_player.erl
index 3f14a6f..fa877c1 100644
--- a/src/battlemap/struct/bm_player.erl
+++ b/src/battlemap/struct/bm_player.erl
@@ -26,7 +26,9 @@
get_id/1,
get_timeline/1,
add_to_timeline/2,
- reset_timeline/1
+ reset_timeline/1,
+
+ get_timeline_field/0
]
).
@@ -70,3 +72,5 @@ new (ID) ->
timeline = []
}.
+-spec get_timeline_field () -> non_neg_integer().
+get_timeline_field () -> #player.timeline.