Mercurial > hg > early-roguelike

comparison rogue4/state.c @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
67 #include <string.h> 67 #include <string.h>
68 #include "rogue.h" 68 #include "rogue.h"
69 69
70 #define READSTAT ((format_error == 0) && (read_error == 0)) 70 #define READSTAT ((format_error == 0) && (read_error == 0))
71 #define WRITESTAT (write_error == 0) 71 #define WRITESTAT (write_error == 0)
72
73 int rs_write_int(FILE *savef, int c);
74 int rs_read_int(int inf, int *i);
72 75
73 int read_error = FALSE; 76 int read_error = FALSE;
74 int write_error = FALSE; 77 int write_error = FALSE;
75 int format_error = FALSE; 78 int format_error = FALSE;
76 int end_of_file = FALSE; 79 int end_of_file = FALSE;
1531 rs_write_object_list(savef, t->_t._t_pack); 1534 rs_write_object_list(savef, t->_t._t_pack);
1532 1535
1533 return(WRITESTAT); 1536 return(WRITESTAT);
1534 } 1537 }
1535 1538
1536 int 1539 void
1537 rs_fix_thing(THING *t) 1540 rs_fix_thing(THING *t)
1538 { 1541 {
1539 THING *item; 1542 THING *item;
1540 THING *tp; 1543 THING *tp;
1541 1544