| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-02-26 17:16:08 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-02-26 17:16:08 +0100 |
| commit | 6494b74a45e27085fd81836f7b8c969431e8ff3c (patch) | |
| tree | e344a24fa2e9a2ee198314c0552c46b235072009 /src/reply | |
| parent | fd4d031ab5b31763d376c663cc049f62ee389243 (diff) | |
Got it to work, I think.
Diffstat (limited to 'src/reply')
| -rw-r--r-- | src/reply/add_char.erl | 4 | ||||
| -rw-r--r-- | src/reply/set_map.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/reply/add_char.erl b/src/reply/add_char.erl index 5e2bf56..7d30bac 100644 --- a/src/reply/add_char.erl +++ b/src/reply/add_char.erl @@ -28,7 +28,7 @@ encode (IX, CharacterInstance) -> Character = character_instance:get_character(CharacterInstance), {X, Y} = character_instance:get_location(CharacterInstance), Attributes = character:get_attributes(Character), - {ActiveWeapon, SecondaryWeapon} = character:get_weapons(Character), + {ActiveWeapon, SecondaryWeapon} = character:get_weapon_ids(Character), jiffy:encode ( @@ -44,7 +44,7 @@ encode (IX, CharacterInstance) -> }, {<<"lcx">>, X}, {<<"lcy">>, Y}, - {<<"tem">>, character:get_owner_id(Character)}, + {<<"pla">>, character:get_owner_id(Character)}, {<<"ena">>, character_instance:get_is_active(CharacterInstance)}, {<<"att">>, attributes_as_json(Attributes)}, {<<"awp">>, ActiveWeapon}, diff --git a/src/reply/set_map.erl b/src/reply/set_map.erl index ba1ddbb..5a2cf55 100644 --- a/src/reply/set_map.erl +++ b/src/reply/set_map.erl @@ -19,7 +19,7 @@ encode (Battlemap) -> [ {<<"w">>, battlemap:get_width(Battlemap)}, {<<"h">>, battlemap:get_height(Battlemap)}, - {<<"t">>, array:to_list(battlemap:list_tiles(Battlemap))} + {<<"t">>, array:sparse_to_list(battlemap:get_tile_ids(Battlemap))} ] } ). |