Unify Map struct common to server and client in src/common/map.h.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index e31dcc4c375f0395b63d97dd8a043dde58bb2bdf..5c35dd6cc2939e5f2176b1a6aec3e9cbb08b14c3 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -186,7 +186,8 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
     uint32_t len_line_new = len_line + strlen(separator);
     char line_new[len_line_new];
     sprintf(line_new, "%s%s", line, separator);
-    uint16_t x, y;
+    uint16_t x = 0;
+    uint16_t y;
     uint32_t z;
     for (z = 0, y = y_start; z < len_line_new; y++)
     {
@@ -204,7 +205,7 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
             try_resize_winmap(win, y + 1 + 1, win->winmap_size.x);
         }
     }
-    * offset = x;
+    *offset = x;
 }
 
 
@@ -276,7 +277,7 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
         add_line(win, "(none)", 0, &offset, 0);
         return;
     }
-    uint16_t kb_n;
+    uint8_t kb_n;
     for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++)
     {
         attr_t attri = 0;
@@ -302,7 +303,7 @@ static void draw_titled_keybinding_list(char * title, struct Win * win,
                                         struct KeyBindingDB * kbdb)
 {
     uint8_t state = 0;
-    uint16_t kb_n = 0;
+    uint8_t kb_n = 0;
     while (0 == state || kb_n < kbdb->n_of_kbs)
     {
         if (0 == state)
@@ -338,14 +339,14 @@ extern void draw_win_log(struct Win * win)
 
 extern void draw_win_map(struct Win * win)
 {
-    try_resize_winmap(win, world.map.size.y, world.map.size.x);
+    try_resize_winmap(win, world.map.size.y, world.map.size.x * 2);
     uint16_t z = 0;
     uint16_t x, y;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0; x < world.map.size.x; x++)
         {
-            set_ch_on_yx(win, y, x, world.map.cells[z]);
+            set_ch_on_yx(win, y, x * 2 + (y % 2), world.map.cells[z]);
             z++;
         }
     }
@@ -397,14 +398,10 @@ extern void draw_win_inventory(struct Win * win)
 
 extern void draw_win_available_keybindings(struct Win * win)
 {
-    char * title = "Active window's keybindings:";
-    struct KeyBindingDB * kbdb;
+    char * title = "Active window's keys:";
     struct Win * win_active = get_win_by_id(world.winDB.active);
-    if     (0 == win_active->view)
-    {
-        kbdb = &win_active->kb;
-    }
-    else if (1 == win_active->view)
+    struct KeyBindingDB * kbdb = &win_active->kb;
+    if      (1 == win_active->view)
     {
         kbdb = &world.kb_wingeom;
     }
@@ -415,7 +412,7 @@ extern void draw_win_available_keybindings(struct Win * win)
     uint16_t offset = 0;
     draw_titled_keybinding_list(title, win, &offset, 0, kbdb);
     add_line(win, " ", 0, &offset, 0);
-    title = "Global keybindings:";
+    title = "Global keys:";
     draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global);
 }
 
@@ -448,7 +445,7 @@ extern void draw_win_keybindings_winconf_keybindings(struct Win * win)
 
 extern void draw_winconf_keybindings(struct Win * win)
 {
-    char * title = "Window's keybindings:";
+    char * title = "Window's keys:";
     uint16_t offset = 0;
     add_line(win, title, 0, &offset, 0);
     add_line(win, " ", 0, &offset, 0);