Re-wrote shift_active_win() to manipulate chain by merely changing the chain pointers...

[plomrogue] / src / draw_wins.c

diff --git a/src/draw_wins.c b/src/draw_wins.c
index b6d13c21e5e14d54fef8f49e85d9f9601f43d706..4dfd054a8149bf578736c25c14a32dbec7cdddaf 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 */
@@ -12,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;
@@ -62,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
@@ -127,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;
@@ -241,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);
-        }
-    }
-}