comparison srogue/rogue.ext @ 228:b67b99f6c92b

Daemons and fuses now return void. Functions for starting and stopping daemons and fuses now expect the type 'void (*func)()'. Only a few functions in XRogue needed to be modified to fit. Determining the type of the argument is left for a later date. Building with GCC5 should now produce less than 200 lines of warnings per game.
author John "Elwin" Edwards
date Sat, 05 Mar 2016 20:49:37 -0500
parents 94a0d9dd5ce1
children d3968e9cb98d
comparison
equal deleted inserted replaced
227:696277507a2e 228:b67b99f6c92b
94 void eat(void); 94 void eat(void);
95 int encread(void *starta, unsigned int size, int inf); 95 int encread(void *starta, unsigned int size, int inf);
96 void encwrite(void *starta, unsigned int size, FILE *outf); 96 void encwrite(void *starta, unsigned int size, FILE *outf);
97 void endit(int a); 97 void endit(int a);
98 void endmsg(void); 98 void endmsg(void);
99 void extinguish(int (*func)()); 99 void extinguish(void (*func)());
100 int extras(void); 100 int extras(void);
101 void fall(struct linked_list *item, bool pr); 101 void fall(struct linked_list *item, bool pr);
102 bool fallpos(struct coord *pos, struct coord *newpos, bool passages); 102 bool fallpos(struct coord *pos, struct coord *newpos, bool passages);
103 void fatal(char *s); 103 void fatal(char *s);
104 bool fight(struct coord *mp, struct object *weap, bool thrown); 104 bool fight(struct coord *mp, struct object *weap, bool thrown);
105 struct linked_list *find_mons(int y, int x); 105 struct linked_list *find_mons(int y, int x);
106 struct linked_list *find_obj(int y, int x); 106 struct linked_list *find_obj(int y, int x);
107 void fix_stick(struct object *cur); 107 void fix_stick(struct object *cur);
108 void fuse(int (*func)(), int arg, int time); 108 void fuse(void (*func)(), int arg, int time);
109 void game_err(int a); 109 void game_err(int a);
110 void genocide(void); 110 void genocide(void);
111 bool get_dir(void); 111 bool get_dir(void);
112 struct linked_list *get_item(char *purpose, int type); 112 struct linked_list *get_item(char *purpose, int type);
113 int get_str(char *opt, WINDOW *awin); 113 int get_str(char *opt, WINDOW *awin);
138 bool is_magic(struct object *obj); 138 bool is_magic(struct object *obj);
139 bool isatrap(char ch); 139 bool isatrap(char ch);
140 bool isring(int hand, int ring); 140 bool isring(int hand, int ring);
141 bool iswearing(int ring); 141 bool iswearing(int ring);
142 void killed(struct linked_list *item, bool pr); 142 void killed(struct linked_list *item, bool pr);
143 void lengthen(int (*func)(), int xtime); 143 void lengthen(void (*func)(), int xtime);
144 void lev_mon(void); 144 void lev_mon(void);
145 void light(struct coord *cp); 145 void light(struct coord *cp);
146 void look(bool wakeup); 146 void look(bool wakeup);
147 bool magring(struct object *what); 147 bool magring(struct object *what);
148 bool makemons(int what); 148 bool makemons(int what);
213 void setoflg(struct object *what, long bit); 213 void setoflg(struct object *what, long bit);
214 void setup(void); 214 void setup(void);
215 char show(int y, int x); 215 char show(int y, int x);
216 bool showtop(int showname); 216 bool showtop(int showname);
217 void sight(int fromfuse); 217 void sight(int fromfuse);
218 void start_daemon(int (*func)(), int arg, int type); 218 void start_daemon(void (*func)(), int arg, int type);
219 void status(int fromfuse); 219 void status(int fromfuse);
220 bool step_ok(unsigned char ch); 220 bool step_ok(unsigned char ch);
221 void stomach(int fromfuse); 221 void stomach(int fromfuse);
222 int str_plus(struct stats *who); 222 int str_plus(struct stats *who);
223 void strucpy(char *s1, char *s2, int len); 223 void strucpy(char *s1, char *s2, int len);