| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-02-28 18:48:01 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-02-28 18:48:01 +0100 |
| commit | 9b413bc5936994b66f3a1c693fbbfad0995c0b93 (patch) | |
| tree | ac488c6819d73eb7bd961d634c5657b42b6577e5 /src/reply | |
| parent | 1b59bdfc0d923a1ebfcebf4d6efceb2f2f4579a4 (diff) | |
Fixes wrong characters being seen as enabled.
Diffstat (limited to 'src/reply')
| -rw-r--r-- | src/reply/add_char.erl | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/reply/add_char.erl b/src/reply/add_char.erl index 42c3359..8518372 100644 --- a/src/reply/add_char.erl +++ b/src/reply/add_char.erl @@ -7,7 +7,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --export([generate/2]). +-export([generate/3]). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -29,12 +29,19 @@ attributes_as_json (Attributes) -> ] }. --spec encode (non_neg_integer(), character_instance:struct()) -> binary(). -encode (IX, CharacterInstance) -> +-spec encode + ( + non_neg_integer(), + character_instance:struct(), + player:id() + ) + -> binary(). +encode (IX, CharacterInstance, PlayerID) -> Character = character_instance:get_character(CharacterInstance), {X, Y} = character_instance:get_location(CharacterInstance), Attributes = character:get_attributes(Character), {ActiveWeapon, SecondaryWeapon} = character:get_weapon_ids(Character), + OwnerID = character:get_owner_id(Character), jiffy:encode ( @@ -50,8 +57,15 @@ encode (IX, CharacterInstance) -> }, {<<"lcx">>, X}, {<<"lcy">>, Y}, - {<<"pla">>, character:get_owner_id(Character)}, - {<<"ena">>, character_instance:get_is_active(CharacterInstance)}, + {<<"pla">>, OwnerID}, + { + <<"ena">>, + ( + character_instance:get_is_active(CharacterInstance) + and + (OwnerID == PlayerID) + ) + }, {<<"att">>, attributes_as_json(Attributes)}, {<<"awp">>, ActiveWeapon}, {<<"swp">>, SecondaryWeapon} @@ -65,8 +79,9 @@ encode (IX, CharacterInstance) -> -spec generate ( non_neg_integer(), - character_instance:struct() + character_instance:struct(), + player:id() ) -> list(binary()). -generate (IX, CharacterInstance) -> - [<<"add_char">>, encode(IX, CharacterInstance)]. +generate (IX, CharacterInstance, PlayerID) -> + [<<"add_char">>, encode(IX, CharacterInstance, PlayerID)]. |