summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-12-10 18:49:05 +0100
committernsensfel <SpamShield0@noot-noot.org>2018-12-10 18:49:05 +0100
commitbf88fff4463697c20fa664852486278771189d35 (patch)
tree15e92b4452551e4abbf53496348f758546c05d02 /src/battle/struct/btl_player.erl
parentb9860582e2334213572d2100d2e047d0ad219702 (diff)
Working on the creation of invasions.
Diffstat (limited to 'src/battle/struct/btl_player.erl')
-rw-r--r--src/battle/struct/btl_player.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/battle/struct/btl_player.erl b/src/battle/struct/btl_player.erl
index 1cb1d93..cedd9e7 100644
--- a/src/battle/struct/btl_player.erl
+++ b/src/battle/struct/btl_player.erl
@@ -3,14 +3,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--type id() :: binary().
-record
(
player,
{
ix :: non_neg_integer(),
- id :: id(),
+ id :: shr_player:id(),
character_ix :: non_neg_integer(),
timeline :: list(any()),
is_active :: boolean()
@@ -19,7 +18,7 @@
-opaque type() :: #player{}.
--export_type([type/0, id/0]).
+-export_type([type/0]).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -56,7 +55,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec get_id (type()) -> id().
+-spec get_id (type()) -> shr_player:id().
get_id (Player) -> Player#player.id.
-spec get_index (type()) -> non_neg_integer().
@@ -86,7 +85,7 @@ add_to_timeline (NewEvents, Player) ->
-spec reset_timeline (type()) -> type().
reset_timeline (Player) -> Player#player{ timeline = [] }.
--spec new (non_neg_integer(), non_neg_integer(), id()) -> type().
+-spec new (non_neg_integer(), non_neg_integer(), shr_player:id()) -> type().
new (IX, CharacterIX, ID) ->
#player
{