X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmap.c;h=ab8148d25846a9f2594c6ebf0e61f187d7150f7f;hb=9aa27a13f9cc3368e81ff348f6a8b992f1a98a99;hp=75dd6dee5a6571ec6e5d89a694964628a03b04bf;hpb=258e57c1621533e206610453047d829cc8aa13fe;p=plomrogue

diff --git a/src/client/map.c b/src/client/map.c
index 75dd6de..ab8148d 100644
--- a/src/client/map.c
+++ b/src/client/map.c
@@ -12,60 +12,8 @@
 #include <string.h> /* strlen(), strncmp() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/rexit.h" /* exit_trouble() */
-#include "../common/yx_uint8.h" /* yx_uint8 */
 #include "io.h" /* send() */
-#include "windows.h" /* struct Win, center_offset(), get_win_by_id() */
-#include "world.h" /* for global world */
-
-
-
-extern void map_scroll(char d)
-{
-    world.autofocus = 0;
-    struct Win * win = get_win_by_id('m');
-    uint16_t offset;
-    if (('8' == d || '2' == d) && world.map.length > win->frame_size.y)
-    {
-        offset = center_offset(win->center.y,
-                               world.map.length, win->frame_size.y);
-        win->center.y = offset + (win->frame_size.y / 2);
-        if ('2' == d && win->center.y < world.map.length - 1)
-        {
-            win->center.y++;
-            return;
-        }
-        win->center.y = win->center.y - ('8' == d && win->center.y > 0);
-    }
-    else if (('4' == d || '6' == d) && (world.map.length*2) > win->frame_size.x)
-    {
-        offset = center_offset(win->center.x,
-                               world.map.length*2, win->frame_size.x);
-        win->center.x = offset + (win->frame_size.x / 2);
-        if ('6' == d && win->center.x < (world.map.length * 2) - 1)
-        {
-            win->center.x++;
-            return;
-        }
-        win->center.x = win->center.x - ('4' == d && win->center.x > 0);
-    }
-}
-
-
-
-extern void map_center()
-{
-    struct Win * win_map = get_win_by_id('m');
-    struct yx_uint8 pos = world.look ? world.look_pos : world.player_pos;
-    win_map->center.y = pos.y;
-    win_map->center.x = pos.x * 2 + (pos.y % 2);
-}
-
-
-
-extern void toggle_autofocus()
-{
-    world.autofocus = world.autofocus ? 0 : 1;
-}
+#include "world.h" /* for world */
 
 
 
@@ -128,7 +76,6 @@ extern uint8_t lookmode_nav(char * command)
         {
             return 0;
         }
-        map_center();
         query_mapcell();
         return 1;
     }