Minor changes to default thing names and symbols.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 4725e806b6ebe56391de9b2ee3423780d7e292c8..6555193a7c0de35b323093a3b33574bf7cf6f27a 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -387,10 +387,10 @@ extern void draw_win_map(struct Win * win)
     init_pair(2, COLOR_BLUE, COLOR_WHITE); //
     init_pair(3, COLOR_RED, COLOR_WHITE); //
     init_pair(4, COLOR_WHITE, COLOR_BLUE); //
-    init_pair(5, COLOR_WHITE, COLOR_RED); //
+    init_pair(5, COLOR_BLUE, COLOR_RED); //
     init_pair(6, COLOR_BLACK, COLOR_RED); //
-    init_pair(7, COLOR_WHITE, COLOR_GREEN); //
-    init_pair(8, COLOR_WHITE, COLOR_YELLOW); //
+    init_pair(7, COLOR_BLUE, COLOR_GREEN); //
+    init_pair(8, COLOR_BLUE, COLOR_YELLOW); //
     init_pair(9, COLOR_BLACK, COLOR_MAGENTA); //
     init_pair(18, COLOR_WHITE, COLOR_CYAN); //
     init_pair(10, COLOR_BLACK, COLOR_CYAN); //
@@ -430,7 +430,7 @@ extern void draw_win_map(struct Win * win)
             char c = world.mem_map[y*world.map.length + x];
             set_ch_on_yx(win, y, x * 2 + (y % 2),     c   | a);
             chtype depth = ' ' | a;  //
-            if (world.stacks_map[y * world.map.length + x] == '2')  //
+            if (world.meta_map_0[y * world.map.length + x] == '2')  //
             {  //
                 depth = '+' | col_mem; //
             }  //
@@ -440,7 +440,7 @@ extern void draw_win_map(struct Win * win)
     attr_t col_plant = COLOR_PAIR(11); //
     attr_t col_altar = COLOR_PAIR(10); //
     attr_t col_tool = COLOR_PAIR(16); //
-    attr_t col_dirt = COLOR_PAIR(17); //
+    attr_t col_corpse = COLOR_PAIR(17); //
     attr_t col_unkraut = COLOR_PAIR(14); //
     attr_t col_animal = COLOR_PAIR(6); //
     attr_t col_player = COLOR_PAIR(3); //
@@ -469,7 +469,7 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = col_player; //
                 } //
-                else if ('a' == c || 'd' == c || 'b' == c) //
+                else if (',' == c || 'd' == c || 'B' == c) //
                 { //
                     a = col_animal; //
                 } //
@@ -477,11 +477,11 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = col_unkraut; //
                 } //
-                else if ('$' == c) //
+                else if ('$' == c || '%' == c || ';' == c || '&' == c) //
                 { //
-                    a = col_dirt; //
+                    a = col_corpse; //
                 } //
-                else if ('m' == c || '/' == c || '-' == c) //
+                else if ('/' == c || ']' == c) //
                 { //
                     a = col_tool; //
                 } //
@@ -493,7 +493,7 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = col_altar; //
                 } //
-                else if ('%' == c || '*' == c) //
+                else if ('(' == c || '*' == c) //
                 { //
                     a = col_plant; //
                 } //
@@ -503,25 +503,29 @@ 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); //
-                chtype depth = ' ' | a;  //
-                char stacksmapval = world.stacks_map[y*world.map.length+x]; //
-                if (stacksmapval == '2')  //
+                chtype meta = ' ' | a;  //
+                char metamap0val = world.meta_map_0[y*world.map.length+x]; //
+                if (metamap0val == '2')  //
                 {  //
-                    depth = '+' | col_stack;  //
+                    meta = '+' | col_stack;  //
                 }  //
-                else if (stacksmapval == 'a') //
+                else if (metamap0val != '0' && metamap0val != '1') //
                 { //
-                    depth = ' ' | col_health_bad; //
+                    char c = world.meta_map_1[y*world.map.length+x];
+                    if (metamap0val == 'a') //
+                    { //
+                        meta = c | col_health_bad; //
+                    } //
+                    else if (metamap0val == 'b') //
+                    { //
+                        meta = c | col_health_middle; //
+                    } //
+                    else if (metamap0val == 'c') //
+                    { //
+                        meta = c | col_health_good; //
+                    } //
                 } //
-                else if (stacksmapval == 'b') //
-                { //
-                    depth = ' ' | col_health_middle; //
-                } //
-                else if (stacksmapval == 'c') //
-                { //
-                    depth = ' ' | col_health_good; //
-                } //
-                set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, depth); //
+                set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, meta); //
                 // set_ch_on_yx(win, y, x * 2 + (y % 2),     c);
                 // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ');
             }
@@ -542,18 +546,18 @@ extern void draw_win_map(struct Win * win)
 
 extern void draw_win_info(struct Win * win)
 {
-    char * dsc_turn      = "Turn: ";
-    char * dsc_hitpoints = "\nHitpoints: ";
-    char * dsc_satiation = "\nSatiation: ";
-    char * dsc_godsmood  = "\nGod's mood: "; // 7DRL
-    char * dsc_godsfavor = "\nGod's favor: "; // 7DRL
+    char * dsc_turn      = "T:";
+    char * dsc_hitpoints = " | H:";
+    char * dsc_satiation = " S:";
+    // char * dsc_godsmood  = "\nGod's mood: "; // 7DRL
+    char * dsc_godsfavor = " G:"; // 7DRL
     uint16_t maxl =   strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3 //
-                    + strlen(dsc_satiation) + 6 + strlen(dsc_godsmood) + 6 //
+                    + strlen(dsc_satiation) + 6 + /*strlen(dsc_godsmood) + 6*/ //
                     + strlen(dsc_godsfavor) + 6; //
     char * text = try_malloc(maxl + 1, __func__);
-    int test = sprintf(text, "%s%d%s%d%s%d%s%d%s%d", dsc_turn, world.turn,
+    int test = sprintf(text, "%s%d%s%d%s%d%s%d", dsc_turn, world.turn,
                        dsc_hitpoints, world.player_lifepoints, dsc_satiation,
-                       world.player_satiation, dsc_godsmood, world.godsmood, //
+                       world.player_satiation, /*dsc_godsmood, world.godsmood,*/ //
                        dsc_godsfavor, world.godsfavor); //
     exit_trouble(test < 0, __func__, "sprintf");
     add_text_with_linebreaks(win, text);