7DRL: New plant mission, plus lots of refactoring of 7DRL-specific code.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 822b0b7777f5863d176ce9cf71f725bfdd34e207..3172ef4931eabd95e21964d85aa665d88c2649bd 100644 (file)
--- 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,7 +399,7 @@ 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); //
             } //
@@ -418,6 +419,7 @@ extern void draw_win_map(struct Win * win)
     init_pair(11, COLOR_BLACK, COLOR_GREEN); //
     init_pair(12, COLOR_BLACK, COLOR_MAGENTA); //
     init_pair(13, COLOR_WHITE, COLOR_BLACK); //
+    init_pair(14, COLOR_RED, COLOR_BLACK); //
     for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
@@ -447,11 +449,11 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(9); //
                 } //
-                else if ('m' == c) //
+                else if ('m' == c || '/' == c || '-' == c) //
                 { //
                     a = COLOR_PAIR(10); //
                 } //
-                else if ('X' == c) //
+                else if ('X' == c || '|' == c) //
                 { //
                     a = COLOR_PAIR(11); //
                 } //
@@ -459,10 +461,14 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(12); //
                 } //
-                else if ('%' == c) //
+                else if ('%' == c || '*' == c) //
                 { //
                     a = COLOR_PAIR(13); //
                 } //
+                else if ('=' == c) //
+                { //
+                    a = COLOR_PAIR(14); //
+                } //
                 // 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); //