warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Daemons and fuses now return void.

Browse source 
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.
This commit is contained in:
John "Elwin" Edwards 2016-03-05 20:49:37 -05:00
parent 6dfde944f0
commit 0a354903e0
14 changed files with 91 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rogue4/daemon.c
View file

@ -48,7 +48,7 @@ d_slot(void)
* Find a particular slot in the table
*/
struct delayed_action *
find_slot(int (*func)())
find_slot(void (*func)())
{
register int i;
register struct delayed_action *dev;
@ -64,7 +64,7 @@ find_slot(int (*func)())
* Start a daemon, takes a function.
*/
void
start_daemon(int (*func)(), int arg, int type)
start_daemon(void (*func)(), int arg, int type)
{
register struct delayed_action *dev;
@ -80,7 +80,7 @@ start_daemon(int (*func)(), int arg, int type)
* Remove a daemon from the list
*/
void
kill_daemon(int (*func)())
kill_daemon(void (*func)())
{
register struct delayed_action *dev;
@ -118,7 +118,7 @@ do_daemons(int flag)
* Start a fuse to go off in a certain number of turns
*/
void
fuse(int (*func)(), int arg, int time, int type)
fuse(void (*func)(), int arg, int time, int type)
{
register struct delayed_action *wire;
@ -134,7 +134,7 @@ fuse(int (*func)(), int arg, int time, int type)
* Increase the time until a fuse goes off
*/
void
lengthen(int (*func)(), int xtime)
lengthen(void (*func)(), int xtime)
{
register struct delayed_action *wire;
@ -148,7 +148,7 @@ lengthen(int (*func)(), int xtime)
* Put out a fuse
*/
void
extinguish(int (*func)())
extinguish(void (*func)())
{
register struct delayed_action *wire;

12
rogue4/rogue.h
View file

@ -324,7 +324,7 @@ typedef struct {
struct delayed_action {
int d_type;
int (*d_func)();
void (*d_func)();
int d_arg;
int d_time;
};
@ -517,7 +517,7 @@ int encread(void *starta, int size, int inf);
void encwrite(void *starta, int size, FILE *outf);
void endmsg(void);
void enter_room(coord *cp);
void extinguish(int (*func)());
void extinguish(void (*func)());
void fall(THING *obj, bool pr);
bool fallpos(coord *pos, coord *newpos, bool pass);
void fatal(char *s);
@ -526,7 +526,7 @@ THING *find_obj(int y, int x);
void fire_bolt(coord *start, coord *dir, char *name);
void fix_stick(THING *cur);
void flush_type(void);
void fuse(int (*func)(), int arg, int time, int type);
void fuse(void (*func)(), int arg, int time, int type);
void genocide(void);
bool get_dir(void);
THING *get_item(char *purpose, int type);
@ -547,11 +547,11 @@ void invis_on(void);
bool is_current(THING *obj);
bool is_magic(THING *obj);
bool issymlink(char *sp);
void kill_daemon(int (*func)());
void kill_daemon(void (*func)());
void killed(THING *tp, bool pr);
void leave(int sig);
void leave_room(coord *cp);
void lengthen(int (*func)(), int xtime);
void lengthen(void (*func)(), int xtime);
bool lock_sc(void);
void look(bool wakeup);
void missile(int ydelta, int xdelta);
@ -601,7 +601,7 @@ void shell(void);
void show_win(WINDOW *scr, char *message);
void sight(void);
int sign(int nm);
void start_daemon(int (*func)(), int arg, int type);
void start_daemon(void (*func)(), int arg, int type);
void start_score(void);
void status(void);
bool step_ok(char ch);