X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=b15e1742d75aab610c6e29e97c34159c28a0f4ba;hb=951248dddace9f7cadcf30700a3c3e6ad7ae2888;hp=4dfd054a8149bf578736c25c14a32dbec7cdddaf;hpb=ca94d7f8451c558a5a3f813466e92564da555a4e;p=plomrogue

diff --git a/src/draw_wins.c b/src/draw_wins.c
index 4dfd054..b15e174 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -11,6 +11,8 @@
 #include "map_objects.h" /* for structs MapObj, Player */
 #include "map.h"         /* for Map struct */
 #include "main.h"        /* for World struct */
+#include "rexit.h"       /* for err_exit() */
+#include "command_db.h"  /* for get_command_longdesc() */
 
 
 
@@ -206,10 +208,18 @@ extern void draw_map_win(struct Win * win)
 extern void draw_info_win(struct Win * win)
 {
     struct World * world = (struct World *) win->data;
-    char text[100];
-    snprintf(text, 100,
-             "Turn: %d\nHitpoints: %d", world->turn, world->player->hitpoints);
+    char * dsc_turn      = "Turn: ";
+    char * dsc_hitpoints = "\nHitpoints: ";
+    char * dsc_score     = "\nScore: ";
+    uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score)
+                    + 10 + 5 + 10;       /* max strlens of numbers to be used */
+    char * text = malloc(maxl + 1);
+    sprintf(text, "%s%d%s%d%s%d",
+            dsc_turn, world->turn,
+            dsc_hitpoints, world->player->hitpoints,
+            dsc_score, world->score);
     draw_with_linebreaks(win, text, 0);
+    free(text);
 }
 
 
@@ -222,21 +232,25 @@ extern void draw_keys_win(struct Win * win)
                            win->frame.size.y - 1);
     uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */
     char * keydesc = malloc(keydescwidth), * keyname;
+    char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win().";
     attr_t attri;
+    char * cmd_dsc;
     for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++)
     {
         if (0 == y && offset > 0)
         {
-            draw_scroll_hint(&win->frame, y, offset + 1, '^');
+            exit_err(draw_scroll_hint(&win->frame, y, offset + 1, '^'),
+                     world, err_hint);
             continue;
         }
         else if (win->frame.size.y == y + 1
                  && 0 < world->keyswindata->max
                         - (win->frame.size.y + offset - 1))
         {
-            draw_scroll_hint(&win->frame, y,
-                             world->keyswindata->max
-                             - (offset + win->frame.size.y) + 2, 'v');
+            exit_err(draw_scroll_hint(&win->frame, y,
+                                      world->keyswindata->max
+                                       - (offset + win->frame.size.y) + 2, 'v'),
+                     world, err_hint);
             continue;
         }
         attri = 0;
@@ -251,19 +265,19 @@ extern void draw_keys_win(struct Win * win)
         keyname = get_keyname(world->keybindings[y + offset].key);
         snprintf(keydesc, keydescwidth, "%-9s", keyname);
         free(keyname);
+        cmd_dsc = get_command_longdsc(world,
+                                      world->keybindings[y + offset].name);
         for (x = 0; x < win->frame.size.x; x++)
         {
             if (x < strlen(keydesc))
             {
                 mvwaddch(win->frame.curses_win, y, x, keydesc[x] | attri);
             }
-            else if (strlen(keydesc) < x
-                     && x < strlen(world->keybindings[y + offset].name)
-                            + strlen(keydesc) + 1)
+            else if (   strlen(keydesc) < x
+                     && x < strlen(cmd_dsc) + strlen(keydesc) + 1)
             {
                 mvwaddch(win->frame.curses_win, y, x,
-                         world->keybindings[y + offset]
-                         .name[x - strlen(keydesc) - 1] | attri);
+                         cmd_dsc[x - strlen(keydesc) - 1] | attri);
             }
             else
             {