X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=5b60d81c644e3aae7f2d210026b41f0098db6475;hb=3bb76ec2bf6cde7a90ebf316a7a0a5c4eea8c06d;hp=13cd5225cfe2cad62d649018d0127d4a264c370f;hpb=c7ff0e4b00f98a0cf65465c552af5ebfcfeaab57;p=plomrogue
diff --git a/src/draw_wins.c b/src/draw_wins.c
index 13cd522..5b60d81 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -1,11 +1,12 @@
+#include "draw_wins.h"
#include
#include
-#include
#include
+#include
#include "windows.h"
-#include "draw_wins.h"
#include "roguelike.h"
#include "keybindings.h"
+#include "actors.h"
void draw_with_linebreaks (struct Win * win, char * text, uint16_t start_y) {
// Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
@@ -75,6 +76,7 @@ void draw_map_win (struct Win * win) {
struct Map * map = world->map;
struct Player * player = world->player;
struct Monster * monster;
+ struct Item * item;
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;
@@ -85,13 +87,17 @@ void draw_map_win (struct Win * win) {
if (y < height_map_av && x < width_map_av) {
mvwaddch(win->frame.curses_win, y, x, cells[z]);
z++; } } }
- 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, '@');
+ for (item = world->item; item != 0; item = item->next)
+ if ( item->pos.y >= map->offset.y && item->pos.y < map->offset.y + win->frame.size.y
+ && item->pos.x >= map->offset.x && item->pos.x < map->offset.x + win->frame.size.x)
+ mvwaddch(win->frame.curses_win, item->pos.y - map->offset.y, item->pos.x - map->offset.x, item->name);
for (monster = world->monster; monster != 0; monster = monster->next)
if ( monster->pos.y >= map->offset.y && monster->pos.y < map->offset.y + win->frame.size.y
&& monster->pos.x >= map->offset.x && monster->pos.x < map->offset.x + win->frame.size.x)
- mvwaddch(win->frame.curses_win, monster->pos.y - map->offset.y, monster->pos.x - map->offset.x, monster->name); }
+ mvwaddch(win->frame.curses_win, monster->pos.y - map->offset.y, monster->pos.x - map->offset.x, monster->name);
+ 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, '@'); }
void draw_info_win (struct Win * win) {
// Draw info window by appending win->data integer value to "Turn: " display.