X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=6555193a7c0de35b323093a3b33574bf7cf6f27a;hb=660657d3637c26a9cb39148d9a6ad54b001bb297;hp=4117e5f36e38e35f685741f4cdd0a810bdb930a1;hpb=a31f16b08b3d4b17f558388dc22f6bd39c975cfb;p=plomrogue

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 4117e5f..6555193 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -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; //
                 } //
@@ -546,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);