Client: Remove redundant map scrolling code.

diff --git a/confclient/commands b/confclient/commands
index 70c61b5a39e7f01c007ece640a33ad3e6a679493..865cc3ee7bcf89ed4578e182052b2d8f94b04a10 100644 (file)
--- a/confclient/commands
+++ b/confclient/commands
@@ -146,18 +146,6 @@ DESCRIPTION 'reload interface config'
 COMMAND save_conf
 DESCRIPTION 'save interface config'
 
-COMMAND map_u
-DESCRIPTION 'map up'
-
-COMMAND map_d
-DESCRIPTION 'map down'
-
-COMMAND map_l
-DESCRIPTION 'map left'
-
-COMMAND map_r
-DESCRIPTION 'map right'
-
 COMMAND to_inv
 DESCRIPTION 'window inventory'
 

diff --git a/confclient/interface_conf b/confclient/interface_conf
index 69dac92dcc6d080cb4dbf322511e396f5fa7255f..00551412cf900f5993ce227f7c2de72ad09ece23 100644 (file)
--- a/confclient/interface_conf
+++ b/confclient/interface_conf
@@ -105,8 +105,4 @@ KEY 99 move_c
 KEY 120 move_x
 KEY 115 move_s
 KEY 119 move_w
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 KEY 108 to_look

diff --git a/confclient/single_wins/info b/confclient/single_wins/info
index 462f6a7c624ee68d10e1e825bfda0d46f411f643..9e899fdf063daa60f74c6a9892c46ccf2a1c21cf 100644 (file)
--- a/confclient/single_wins/info
+++ b/confclient/single_wins/info
@@ -115,9 +115,5 @@ KEY 99 move_c
 KEY 120 move_x
 KEY 115 move_s
 KEY 119 move_w
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

diff --git a/confclient/single_wins/inventory b/confclient/single_wins/inventory
index 2a24b67a0df0c7162f0caf0edcbb679144997807..03ef22e4bc09540a09e3734dcdf9c89ad8a309f9 100644 (file)
--- a/confclient/single_wins/inventory
+++ b/confclient/single_wins/inventory
@@ -113,9 +113,5 @@ KEY 99 move_c
 KEY 120 move_x
 KEY 115 move_s
 KEY 119 move_w
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

diff --git a/confclient/single_wins/log b/confclient/single_wins/log
index 0b92f775b1d528c393970d746cb72c707f7b558e..6e046a9714c7cc3acf57ba77ff09ced2c951344b 100644 (file)
--- a/confclient/single_wins/log
+++ b/confclient/single_wins/log
@@ -115,9 +115,5 @@ KEY 99 move_c
 KEY 120 move_x
 KEY 115 move_s
 KEY 119 move_w
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

diff --git a/confclient/single_wins/map b/confclient/single_wins/map
index 6d6a399c8c8cece31fba3a835770e2db488a9d9f..3b736bd0a1552791f03af82d197f35714d8a0553 100644 (file)
--- a/confclient/single_wins/map
+++ b/confclient/single_wins/map
@@ -51,10 +51,6 @@ NAME 'Map'
 BREAK 0
 WIDTH 0
 HEIGHT 0
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 
 WINDOW 0
 NAME 'Set global keys'

diff --git a/confclient/single_wins/things_here b/confclient/single_wins/things_here
index 4936331d731a5ba03210ed3edd1dc50a349a8dac..2abc3e58d9c5ddde81f36cf265bd440d1cf910dd 100644 (file)
--- a/confclient/single_wins/things_here
+++ b/confclient/single_wins/things_here
@@ -116,9 +116,5 @@ KEY 99 move_c
 KEY 120 move_x
 KEY 115 move_s
 KEY 119 move_w
-KEY 259 map_u
-KEY 258 map_d
-KEY 260 map_l
-KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

diff --git a/src/client/control.c b/src/client/control.c
index 13e57dd93aa5de1ca97a2e4f8f744082ec42b45a..55dbd9e40d45a4062698031935d22c4555f3f804 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -17,7 +17,7 @@
 #include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
                           * mod_selected_keyb(), move_keyb_selection()
                           */
-#include "map.h" /* map_scroll(),toggle_lookmode(),lookmode_nav()*/
+#include "map.h" /* toggle_lookmode(), lookmode_nav()*/
 #include "wincontrol.h" /* shift_active_win(), resize_active_win(),
                          * toggle_win_size_type(), toggle_window(),
                          * cycle_active_win(), scroll_v_screen(),
@@ -134,11 +134,7 @@ static uint8_t try_kb_manip(char * command)
 
 static uint8_t try_client_commands(struct Command * command)
 {
-    return (   try_1args(command, "map_u", map_scroll, '8')
-            || try_1args(command, "map_d", map_scroll, '2')
-            || try_1args(command, "map_r", map_scroll, '6')
-            || try_1args(command, "map_l", map_scroll, '4')
-            || try_1args(command, "inv_u", nav_inventory, 'u')
+    return (   try_1args(command, "inv_u", nav_inventory, 'u')
             || try_1args(command, "inv_d", nav_inventory, 'd')
             || try_1args(command, "cyc_win_f", cycle_active_win, 'f')
             || try_1args(command, "cyc_win_b", cycle_active_win, 'b')

diff --git a/src/client/map.c b/src/client/map.c
index f8ff0616bc502d683fc63d8d96bc15ab0b69eef3..ab8148d25846a9f2594c6ebf0e61f187d7150f7f 100644 (file)
--- a/src/client/map.c
+++ b/src/client/map.c
@@ -12,42 +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)
-{
-    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);
-    }
-}
+#include "world.h" /* for world */
 
 
 

diff --git a/src/client/map.h b/src/client/map.h
index cfba067893062605bd749ee7071343f44ec64a42..8a3675084d1df838debf93145be2c0e5dbcba7ab 100644 (file)
--- a/src/client/map.h
+++ b/src/client/map.h
@@ -13,11 +13,6 @@
 #include <stdint.h> /* uint8_t */
 
 
-/* Try changing map window's focus into direction "d" (north = "N" etc.). Unset
- * world.focus_each_turn.
- */
-extern void map_scroll(char d);
-
 /* Toggle world.look (moving look cursor instead of player over map). */
 extern void toggle_lookmode();