From 9b91ff37a1e39f48631b5bee338c31318d1e2336 Mon Sep 17 00:00:00 2001
From: nsensfel <SpamShield0@noot-noot.org>
Date: Fri, 15 Feb 2019 15:53:58 +0100
Subject: /{btl,map}_{map,location,direction}/shr_\2/

---
 src/battle/reply/btl_add_char.erl |  2 +-
 src/battle/reply/btl_set_map.erl  | 35 -----------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 src/battle/reply/btl_set_map.erl

(limited to 'src/battle/reply')

diff --git a/src/battle/reply/btl_add_char.erl b/src/battle/reply/btl_add_char.erl
index 6cd2157..9518677 100644
--- a/src/battle/reply/btl_add_char.erl
+++ b/src/battle/reply/btl_add_char.erl
@@ -46,7 +46,7 @@ generate (IX, Character, PlayerIX) ->
             <<"hea">>,
             btl_character:get_current_health(Character)
          },
-         {<<"lc">>, btl_location:encode(Location)},
+         {<<"lc">>, shr_location:encode(Location)},
          {<<"pla">>, CharacterPlayerIX},
          {
             <<"ena">>,
diff --git a/src/battle/reply/btl_set_map.erl b/src/battle/reply/btl_set_map.erl
deleted file mode 100644
index 3be6985..0000000
--- a/src/battle/reply/btl_set_map.erl
+++ /dev/null
@@ -1,35 +0,0 @@
--module(btl_set_map).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (btl_map:type()) -> {list(any())}.
-generate (Map) ->
-   {
-      [
-         {<<"msg">>, <<"set_map">>},
-         {<<"w">>, btl_map:get_width(Map)},
-         {<<"h">>, btl_map:get_height(Map)},
-         {
-            <<"t">>,
-            lists:map
-            (
-               fun shr_tile:instance_to_binary_list/1,
-               tuple_to_list(btl_map:get_tile_instances(Map))
-            )
-         }
-      ]
-   }.
-- 
cgit v1.2.3-70-g09d2