Re-wrote map object system to use same structs for items and monsters, and switched...

[plomrogue] / src / readwrite.h

diff --git a/src/readwrite.h b/src/readwrite.h
index bcdf10eb20632caada30e8ee02fb35cd586ee8cf..99d490c6c2c3a23fa35f6949486780e105ba4de4 100644 (file)
--- a/src/readwrite.h
+++ b/src/readwrite.h
@@ -14,13 +14,22 @@ struct World;
 
 
 
-/* Wrappers to calling from function called "f" of fopen(), fclose() and fgets()
- * and calling exit_err() with appropriate error messages.
+/* Wrappers to calling from function called "f" of fopen(), fclose(), fgets()
+ * and fwrite() and calling exit_err() with appropriate error messages.
  */
 extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f);
 extern void try_fclose(FILE * file, struct World * w, char * f);
-extern void try_fgets(char * line, int size, FILE * file,
-                      struct World * w, char * f);
+extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
+                       struct World * w, char * f);
+
+
+
+/* Wrapper to calling fgets() from function called "f". The return code of
+ * fgets() is returned unless it is NULL *and* ferror() indicates that an error
+ * occured; otherwise end of file is assumed and NULL is returned properly.
+ */
+extern char * try_fgets(char * line, int size, FILE * file,
+                        struct World * w, char * f);
 
 
 
@@ -53,8 +62,8 @@ extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p,
 
 
 
-/* These routines for reading values "x" from / writing values to "file" ensure a
- * defined endianness and consistent error codes: return 0 on success and 1 on
+/* These routines for reading values "x" from / writing values to "file" ensure
+ * a defined endianness and consistent error codes: return 0 on success and 1 on
  * fgetc()/fputc() failure.
  */
 extern uint8_t read_uint8(FILE * file, uint8_t * x);