X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/gitweb.css?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fdraw_wins.c;h=59ce436be61472374ea6680c20c3630c6d90ad6f;hb=5987599c7531fb17ad174824335d99339200f306;hp=940b76813b2ecbb0711740288f7e3225ff38aa7e;hpb=8967ea710e8cb7943da314a747e737d511dbc4d9;p=plomrogue

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 940b768..59ce436 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -361,7 +361,7 @@ extern void draw_win_log(struct Win * win)
         if (x > win->frame_size.x || '\n' == world.log[i])
         {
             n_postbreak_lines++;
-            x = 0;
+            x = 1;
         }
     }
     if (n_postbreak_lines > win->frame_size.y)
@@ -369,6 +369,7 @@ extern void draw_win_log(struct Win * win)
         uint32_t size = n_postbreak_lines * (win->frame_size.x + 1);
         win->winmap = try_malloc(sizeof(chtype) * size, __func__);
         for (i = 0; i < size; win->winmap[i] = ' ', i++);
+        /* TODO: This should only be done with "long" line break style. */
         do_realloc_winmap = 0;
         draw_text_from_bottom(win, world.log);
         do_realloc_winmap = 1;
@@ -398,14 +399,19 @@ extern void draw_win_map(struct Win * win)
             { //
                 a = COLOR_PAIR(1); //
             } //
-            else if (c_m == 'X') //
+            else if (c_m == 'X' || c_m == '|') //
             { //
                 a = COLOR_PAIR(3); //
             } //
             // attr_t a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem;
             char c = world.mem_map[y*world.map.length + x];
             set_ch_on_yx(win, y, x * 2 + (y % 2),     c   | a);
-            set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a);
+            chtype depth = ' ' | a;  //
+            if (world.stacks_map[y * world.map.length + x] == '2')  //
+            {  //
+                depth = '+' | COLOR_PAIR(2);  //
+            }  //
+            set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, depth);
         }
     }
     init_pair(4, COLOR_BLUE, COLOR_BLACK); //
@@ -448,11 +454,11 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(9); //
                 } //
-                else if ('m' == c || '/' == c) //
+                else if ('m' == c || '/' == c || '-' == c) //
                 { //
                     a = COLOR_PAIR(10); //
                 } //
-                else if ('X' == c) //
+                else if ('X' == c || '|' == c) //
                 { //
                     a = COLOR_PAIR(11); //
                 } //
@@ -460,7 +466,7 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(12); //
                 } //
-                else if ('%' == c) //
+                else if ('%' == c || '*' == c) //
                 { //
                     a = COLOR_PAIR(13); //
                 } //
@@ -470,7 +476,12 @@ extern void draw_win_map(struct Win * win)
                 } //
                 // char c = world.map.cells[y*world.map.length + x];
                 set_ch_on_yx(win, y, x * 2 + (y % 2),     c | a); //
-                set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); //
+                chtype depth = ' ' | a;  //
+                if (world.stacks_map[y * world.map.length + x] == '2')  //
+                {  //
+                    depth = '+' | COLOR_PAIR(13);  //
+                }  //
+                set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, depth); //
                 // set_ch_on_yx(win, y, x * 2 + (y % 2),     c);
                 // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ');
             }
@@ -545,6 +556,7 @@ extern void draw_win_terrain_stack(struct Win * win)
     char * wait_response = "(polling)";
     char * text = world.things_here ? world.things_here : wait_response;
     add_text_with_linebreaks(win, text);
+    win->center.y = world.things_here_scroll + (win->frame_size.y / 2);  //
 }