X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=4dfd054a8149bf578736c25c14a32dbec7cdddaf;hb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;hp=6287b20587039729aa4c6fd9fdd219063fc496c7;hpb=b4b3167da3c47ae09419fb5d871eedf85dc6e957;p=plomrogue
diff --git a/src/draw_wins.c b/src/draw_wins.c
index 6287b20..4dfd054 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -14,13 +14,20 @@
+/* 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,
struct Map * map, struct Win * win);
-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;
@@ -64,7 +71,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
@@ -129,6 +136,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;
@@ -243,26 +273,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);
- }
- }
-}