Server/py: Some more mem map handling fixes …

[plomrogue] / src / client / windows.c

diff --git a/src/client/windows.c b/src/client/windows.c
index 49af3ec77128198c68ae3dc23e62e48db88d6a1c..fa626848aacfe5f3b0ff9e5abc8d41e3173176b4 100644 (file)
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -21,10 +21,10 @@
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
                         * draw_win_inventory(), draw_win_info(), draw_win_log(),
-                        * draw_win_global_keys(),draw_win_active_windows_keys(),
                         * draw_win_keybindings_winconf_keybindings(),
                         * draw_win_keybindings_winconf_geometry(),
-                        * draw_win_keybindings_global(), draw_win_map()
+                        * draw_win_keybindings_global(), draw_win_map(),
+                        * draw_win_terrain_stack()
                         */
 #include "wincontrol.h" /* toggle_window() */
 #include "world.h" /* world */
@@ -119,10 +119,9 @@ static void (* get_drawfunc_by_char(char c)) ()
 {
     void (* f) (struct Win *) = NULL;
     if (   match_func(c, &f, 'c', draw_win_inventory)
+        || match_func(c, &f, 's', draw_win_terrain_stack)
         || match_func(c, &f, 'i', draw_win_info)
         || match_func(c, &f, 'l', draw_win_log)
-        || match_func(c, &f, 'g', draw_win_global_keys)
-        || match_func(c, &f, 'a', draw_win_active_windows_keys)
         || match_func(c, &f, 'm', draw_win_map)
         || match_func(c, &f, '0', draw_win_keybindings_global)
         || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)
@@ -310,7 +309,7 @@ static void draw_wins(struct Win * w)
         {
             chtype ch = w->winmap[(y * w->winmap_size.x) + x];
             mvwaddch(world.winDB.v_screen, w->start.y + (y - offset_y),
-                                      w->start.x + (x - offset_x), ch);
+                     w->start.x + (x - offset_x), ch);
         }
     }
     free(w->winmap); /* NULL so draw_wins.c's try_resize_winmap() may always  */