diff rogue4/state.c @ 239:837044d2c362

Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents c10fe421b8fb
children b49d8b963df3
line wrap: on
line diff
--- a/rogue4/state.c	Tue Mar 08 19:45:41 2016 -0500
+++ b/rogue4/state.c	Fri Mar 11 19:47:52 2016 -0500
@@ -70,6 +70,9 @@
 #define READSTAT ((format_error == 0) && (read_error == 0))
 #define WRITESTAT (write_error == 0)
 
+int rs_write_int(FILE *savef, int c);
+int rs_read_int(int inf, int *i);
+
 int read_error   = FALSE;
 int write_error  = FALSE;
 int format_error = FALSE;
@@ -1533,7 +1536,7 @@
     return(WRITESTAT);
 }
 
-int
+void
 rs_fix_thing(THING *t)
 {
     THING *item;