Player earns a score by killing enemies.

[plomrogue] / src / draw_wins.c

diff --git a/src/draw_wins.c b/src/draw_wins.c
index 81cc26138efe8406727215bbf98e48506d5c3167..7747757b82d957de7ae54d2ab26126636210f3bf 100644 (file)
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -1,3 +1,5 @@
+/* draw_wins.c */
+
 #include "draw_wins.h"
 #include <stdlib.h>      /* for malloc(), free() */
 #include <stdint.h>      /* for uint16_t */
@@ -9,8 +11,16 @@
 #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() */
+
+
 
+/* Write "text" into window "win" as far as possible. Start on row "start_y". */
+static void draw_with_linebreaks(struct Win * win, char * text,
+                                 uint16_t start_y);
 
+/* Write "text" not starting from the top but from the bottom of "win". */
+static void draw_text_from_bottom(struct Win * win, char * text);
 
 /* Draw onto "map" in "win" the objects in the chain at "start". */
 static void draw_map_objects(struct World * world, struct MapObj * start,
@@ -18,7 +28,7 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
 
 
 
-extern void draw_with_linebreaks(struct Win * win, char * text,
+static void draw_with_linebreaks(struct Win * win, char * text,
                                  uint16_t start_y)
 {
     uint16_t x, y;
@@ -62,7 +72,7 @@ extern void draw_with_linebreaks(struct Win * win, char * text,
 
 
 
-extern void draw_text_from_bottom (struct Win * win, char * text)
+static void draw_text_from_bottom (struct Win * win, char * text)
 {
     /* Determine number of lines text would have in a window of win's width,
      * but infinite height. Treat \n and \0 as control chars for incrementing
@@ -127,6 +137,29 @@ extern void draw_text_from_bottom (struct Win * win, char * text)
 
 
 
+static void draw_map_objects(struct World * world, struct MapObj * start,
+                             struct Map * map, struct Win * win)
+{
+    struct MapObj * o;
+    struct MapObjDef * d;
+    char c;
+    for (o = start; o != 0; o = o->next)
+    {
+        if (   o->pos.y >= map->offset.y
+            && o->pos.y < map->offset.y + win->frame.size.y
+            && o->pos.x >= map->offset.x
+            && o->pos.x < map->offset.x + win->frame.size.x)
+        {
+            d = get_map_obj_def (world, o->type);
+            c = d->mapchar;
+            mvwaddch(win->frame.curses_win,
+                     o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
+        }
+    }
+}
+
+
+
 extern void draw_log_win(struct Win * win)
 {
     struct World * world = (struct World *) win->data;
@@ -176,7 +209,8 @@ 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);
+             "Turn: %d\nHitpoints: %d\nScore: %d",
+             world->turn, world->player->hitpoints, world->score);
     draw_with_linebreaks(win, text, 0);
 }
 
@@ -190,21 +224,24 @@ 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;
     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;
@@ -241,26 +278,3 @@ extern void draw_keys_win(struct Win * win)
     }
     free(keydesc);
 }
-
-
-
-static void draw_map_objects(struct World * world, struct MapObj * start,
-                             struct Map * map, struct Win * win)
-{
-  struct MapObj * o;
-  struct MapObjDef * d;
-  char c;
-  for (o = start; o != 0; o = o->next)
-  {
-    if (   o->pos.y >= map->offset.y
-        && o->pos.y < map->offset.y + win->frame.size.y
-        && o->pos.x >= map->offset.x
-        && o->pos.x < map->offset.x + win->frame.size.x)
-    {
-      d = get_map_obj_def (world, o->type);
-      c = d->mapchar;
-      mvwaddch(win->frame.curses_win,
-               o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
-    }
-  }
-}