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 bebcdc058c39ee6c1298f0b37acf8fec2858efbe..99d490c6c2c3a23fa35f6949486780e105ba4de4 100644 (file)
--- a/src/readwrite.h
+++ b/src/readwrite.h
@@ -19,13 +19,20 @@ struct World;
  */
 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);
+
+
+
 /* Wrapper to successive call of fclose() from function called "f" on "file",
  * then unlink() on file at "p2" if it exists, then rename() on "p1" to "p2".
  * Used for handling atomic saving of files via temp files.