X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=797864adb5d9cb854db441bb4ab759bc585eacab;hb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;hp=53ce68da0a4691846bc86e46b77251562c33f5c0;hpb=88aa628d575ff69afba9e7d7a90873e40ded1fde;p=plomrogue

diff --git a/src/draw_wins.c b/src/draw_wins.c
index 53ce68d..797864a 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -8,7 +8,9 @@
 #include "windows.h"     /* for structs Win, Frame, for draw_scroll_hint() */
 #include "misc.h"        /* for center_offset(), try_malloc() */
 #include "keybindings.h" /* for struct KeyBinding, for get_name_to_keycode() */
-#include "map_objects.h" /* for structs MapObj, Player */
+#include "map_objects.h" /* for structs MapObj, get_map_object_def(),
+                          * get_player()
+                          */
 #include "map.h"         /* for Map struct */
 #include "main.h"        /* for World struct */
 #include "rexit.h"       /* for err_exit() */
@@ -41,6 +43,16 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
 static char * get_kb_line_and_iterate(struct World * world,
                                       struct KeyBinding ** kb_pp);
 
+/* Draw horizontal scroll hints in "frame" at the end line or a start line of y
+ * value "start" if the current "y" fits one of these lines and the number of
+ * lines "n_owned" and the "offset" make it appropriate.
+ *
+ * Return 1 if a scroll hint was drawn, else 0.
+ */
+static uint8_t scroll_hint_helper(struct World * world, uint16_t start,
+                                  uint16_t y, uint16_t offset, uint16_t n_owned,
+                                  struct Frame * frame, char * f_name);
+
 /* Draw from line "start" on config view for keybindings defined at "kb". */
 static void draw_kb_view(struct World * world, struct Win * win,
                          char * f_name, struct KeyBiData * kb, uint8_t start);
@@ -192,17 +204,23 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
     struct MapObj * o;
     struct MapObjDef * d;
     char c;
-    for (o = start; o != 0; o = o->next)
+    uint8_t i;
+    for (i = 0; i < 2; i++)
     {
-        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)
+        for (o = start; o != 0; o = o->next)
         {
-            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);
+            if (   (   (0 == i && 0 == o->lifepoints)      /* Draw in-animate */
+                    || (1 == i && 0 < o->lifepoints))      /* objects first.  */
+                && 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_object_def(world, o->type);
+                c = d->char_on_map;
+                mvwaddch(win->frame.curses_win,
+                         o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
+            }
         }
     }
 }
@@ -226,32 +244,50 @@ static char * get_kb_line_and_iterate(struct World * world,
 
 
 
+static uint8_t scroll_hint_helper(struct World * world, uint16_t start,
+                                  uint16_t y, uint16_t offset, uint16_t n_owned,
+                                  struct Frame * frame, char * f_name)
+{
+    uint8_t ret = 0;
+    char * err_hint = trouble_msg(world, f_name, "draw_scroll_hint()");
+    if (start == y && offset > 0)
+    {
+        uint8_t test = draw_scroll_hint(frame, y, offset + 1, '^');
+        exit_err(test, world, err_hint);
+        ret = 1;
+    }
+    else if (   frame->size.y == y + 1
+             && n_owned > frame->size.y + offset - 1 - start)
+    {
+        uint8_t pos = n_owned - (offset + frame->size.y) + 2 + start;
+        uint8_t test = draw_scroll_hint(frame, y, pos, 'v');
+        exit_err(test, world, err_hint);
+        ret = 1;
+    }
+    free(err_hint);
+    return ret;
+}
+
+
+
 static void draw_kb_view(struct World * world, struct Win * win,
                          char * f_name, struct KeyBiData * kb, uint8_t start)
 {
     if (0 == kb->kbs)
     {
         draw_line(win, start, "(none)", 0, 0);
+        return;
     }
-    char * err_hint = trouble_msg(world, f_name, "draw_scroll_hint()");
     uint16_t kb_max = get_n_of_keybs(kb->kbs) - 1;
-    uint16_t y, offset;
+    uint16_t offset;
     offset = center_offset(kb->select, kb_max, win->frame.size.y - 1 - start);
-    uint16_t y_border = win->frame.size.y + offset - 1 - start;
     struct KeyBinding * kb_p = get_keyb_of_n(kb->kbs, offset + (offset > 0));
+    uint16_t y;
     for (y = start; 0 != kb_p && y < win->frame.size.y; y++)
     {
-        if (start == y && offset > 0)
+        if (scroll_hint_helper(world, start, y, offset, kb_max, &win->frame,
+                               f_name))
         {
-            uint8_t test = draw_scroll_hint(&win->frame, y, offset + 1, '^');
-            exit_err(test, world, err_hint);
-            continue;
-        }
-        else if (win->frame.size.y == y + 1 && kb_max > y_border)
-        {
-            uint16_t pos = kb_max - (offset + win->frame.size.y) + 2 + start;
-            uint8_t test = draw_scroll_hint(&win->frame, y, pos, 'v');
-            exit_err(test, world, err_hint);
             continue;
         }
         attr_t attri = 0;
@@ -265,9 +301,9 @@ static void draw_kb_view(struct World * world, struct Win * win,
         }
         char * kb_line = get_kb_line_and_iterate(world, &kb_p);
         draw_line(win, y, kb_line, attri, 1);
+
         free(kb_line);
     }
-    free(err_hint);
 }
 
 
@@ -324,7 +360,6 @@ extern void draw_win_map(struct Win * win)
 {
     struct World * world = (struct World *) win->data;
     struct Map * map = world->map;
-    struct Player * player = world->player;
     char * cells = map->cells;
     uint16_t width_map_av  = map->size.x  - map->offset.x;
     uint16_t height_map_av = map->size.y - map->offset.y;
@@ -341,17 +376,7 @@ extern void draw_win_map(struct Win * win)
             }
         }
     }
-    draw_map_objects (world, (struct MapObj *) world->item, map, win);
-    draw_map_objects (world, (struct MapObj *) world->monster, map, win);
-    if (   player->pos.y >= map->offset.y
-        && player->pos.y < map->offset.y + win->frame.size.y
-        && player->pos.x >= map->offset.x
-        && player->pos.x < map->offset.x + win->frame.size.x)
-    {
-        mvwaddch(win->frame.curses_win,
-                 player->pos.y - map->offset.y, player->pos.x - map->offset.x,
-                 '@');
-    }
+    draw_map_objects(world, world->map_objs, map, win);
 }
 
 
@@ -365,9 +390,10 @@ extern void draw_win_info(struct Win * win)
     uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score)
                     + 10 + 5 + 10;       /* max strlens of numbers to be used */
     char text[maxl + 1];
+    struct MapObj * player = get_player(world);
     sprintf(text, "%s%d%s%d%s%d",
             dsc_turn, world->turn,
-            dsc_hitpoints, world->player->hitpoints,
+            dsc_hitpoints, player->lifepoints,
             dsc_score, world->score);
     draw_with_linebreaks(win, text, 0);
 }
@@ -376,7 +402,39 @@ extern void draw_win_info(struct Win * win)
 
 extern void draw_win_inventory(struct Win * win)
 {
-    mvwaddstr(win->frame.curses_win, 0, 0, "(empty)");
+    struct World * world = (struct World *) win->data;
+    struct MapObj * player = get_player(world);
+    if (NULL == player->owns)
+    {
+        mvwaddstr(win->frame.curses_win, 0, 0, "(empty)");
+        return;
+    }
+    char * f_name = "draw_win_inventory()";
+    struct MapObj * owned = player->owns;
+    uint8_t n_owned;
+    for (n_owned = 0; NULL != owned->next; owned = owned->next, n_owned++);
+    uint8_t offset = center_offset(world->inventory_select, n_owned,
+                                   win->frame.size.y - 1);
+    uint8_t i;
+    for (i = 0, owned = player->owns; i < offset + (offset > 0);
+         i++, owned = owned->next);
+    uint8_t y;
+    for (y = 0; NULL != owned && y < win->frame.size.y; y++)
+    {
+        if (scroll_hint_helper(world, 0, y, offset, n_owned, &win->frame,
+                               f_name))
+        {
+            continue;
+        }
+        attr_t attri = 0;
+        if (y == world->inventory_select - offset)
+        {
+            attri = A_REVERSE;
+        }
+        struct MapObjDef * mod = get_map_object_def(world, owned->type);
+        draw_line(win, y, mod->name, attri, 0);
+        owned = owned->next;
+    }
 }