Simplified textfile_sizes() and replaced all get_linemax() calls with it.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 2cf9e62f936671b84faeca3eaecb4df8cb5fd267..97c9fa69a96d0a2445eb54965c2fa6b5fdab3b47 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -5,14 +5,15 @@
 #include <unistd.h> /* for unlink(), acess() */
 #include <stdlib.h> /* for size_t, calloc(), free() */
 #include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
-#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
-                        * try_fopen(), try_fclose(), get_linemax()
+#include <stdint.h> /* for uint8_t, uint16_t */
+#include "readwrite.h" /* for try_fopen(), try_fclose(), textfile_sizes(),
+                        * try_fputc(), try_fgetc()
                         */
 #include "map_objects.h" /* for struct MapObj, get_player(), read_map_objects(),
                           * write_map_objects()
                           */
 #include "map_object_actions.h" /* for struct MapObjAct */
+#include "ai.h" /* for pretty_dumb_ai() */
 #include "map.h" /* for Map struct, is_passable() */
 #include "main.h" /* for world global */
 #include "yx_uint16.h" /* for yx_uint16 struct */
@@ -194,8 +195,6 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
 extern void turn_over(char action)
 {
     char * f_name = "turn_over()";
-    char * err_write = "Trouble in turn_over() with write_uint8() "
-                       "writing to opened file 'record_tmp'.";
 
     char * recordfile_tmp = "record_tmp";
     char * recordfile     = "record";
@@ -203,18 +202,18 @@ extern void turn_over(char action)
     {
         FILE * file_old = try_fopen(recordfile,     "r", f_name);
         FILE * file_new = try_fopen(recordfile_tmp, "w", f_name);
-        char c = fgetc(file_old);
+        int c = try_fgetc(file_old, f_name);
         while (EOF != c)
         {
-            exit_err(write_uint8(c, file_new), err_write);
-            c = fgetc(file_old);
+            try_fputc((uint8_t) c, file_new, f_name);
+            c = try_fgetc(file_old, f_name);
         }
         try_fclose(file_old, f_name);
-        exit_err(write_uint8(action, file_new), err_write);
+        try_fputc(action, file_new, f_name);
         if (   is_command_id_shortdsc(action, "drop")
             || is_command_id_shortdsc(action, "use"))
         {
-            exit_err(write_uint8(world.inventory_select, file_new), err_write);
+            try_fputc(world.inventory_select, file_new, f_name);
         }
         try_fclose_unlink_rename(file_new, recordfile_tmp, recordfile, f_name);
     }
@@ -237,9 +236,7 @@ extern void turn_over(char action)
                 {
                     break;
                 }
-                char * sel = "NSEW";
-                map_object->command = get_moa_id_by_name("move");
-                map_object->arg = sel[rrand() % 4];
+                pretty_dumb_ai(map_object);
             }
             first_round = 0;
             map_object->progress++;
@@ -286,7 +283,7 @@ extern void load_game()
     char * f_name = "load_game2()";
     char * filename = "savefile";
     FILE * file = try_fopen(filename, "r", f_name);
-    uint16_t linemax = get_linemax(file, f_name);
+    uint16_t linemax = textfile_sizes(file, NULL);
     char line[linemax + 1];
     try_fgets(line, linemax + 1, file, f_name);
     world.mapseed = atoi(line);