Removed unnecessary NULLings of pointers, explained kept ones.

[plomrogue] / src / client / io.c

diff --git a/src/client/io.c b/src/client/io.c
index 2f7d18ad25f5c6c6fc43db5657700b750cd0b23e..4623b3d89bbe4e6aa1912c24b8acdec649637b34 100644 (file)
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -5,6 +5,7 @@
 #include <fcntl.h> /* open() */
 #include <limits.h> /* PIPE_BUF */
 #include <ncurses.h> /* halfdelay(), getch() */
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
 #include <stdio.h> /* FILE, sprintf(), fseek() */
 #include <string.h> /* strcmp(), strlen(), memcpy() */
@@ -17,8 +18,9 @@
                                   * try_fgetc()
                                   */
 #include "control.h" /* try_key() */
-#include "map_window.h" /* for map_center() */
-#include "windows.h" /* draw_all_wins() */
+#include "map_window.h" /* map_center() */
+#include "misc.h" /* reset_windows() */
+#include "windows.h" /* reset_windows_on_winch(), draw_all_wins() */
 #include "world.h" /* world global */
 
 
@@ -77,7 +79,7 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file)
     char * f_name = "read_inventory()";
     char * delimiter = "%\n";
     free(world.player_inventory);
-    world.player_inventory = NULL;
+    world.player_inventory = NULL;          /* Avoids illegal strlen() below. */
     while (1)
     {
         try_fgets(read_buf, linemax + 1, file, f_name);
@@ -257,6 +259,12 @@ extern char * io_loop()
     uint8_t change_in_client = 0;
     while (1)
     {
+        if (world.winch)
+        {
+            reset_windows_on_winch();
+            world.winch = 0;
+            change_in_client++;
+        }
         if (read_world() || change_in_client)
         {
             draw_all_wins();