Mercurial > hg > early-roguelike
diff srogue/daemon.c @ 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 |
line wrap: on
line diff
--- a/srogue/daemon.c Sat Mar 05 12:10:20 2016 -0500 +++ b/srogue/daemon.c Sat Mar 05 20:49:37 2016 -0500 @@ -34,7 +34,7 @@ * Insert a function in the daemon list. */ struct delayed_action * -d_insert(int (*func)(), int arg, int type, int time) +d_insert(void (*func)(), int arg, int type, int time) { reg struct delayed_action *dev; @@ -72,7 +72,7 @@ * Find a particular slot in the table */ struct delayed_action * -find_slot(int (*func)()) +find_slot(void (*func)()) { reg struct delayed_action *dev; @@ -87,7 +87,7 @@ * Start a daemon, takes a function. */ void -start_daemon(int (*func)(), int arg, int type) +start_daemon(void (*func)(), int arg, int type) { d_insert(func, arg, type, DAEMON); } @@ -112,7 +112,7 @@ * Start a fuse to go off in a certain number of turns */ void -fuse(int (*func)(), int arg, int time) +fuse(void (*func)(), int arg, int time) { d_insert(func, arg, AFTER, time); } @@ -122,7 +122,7 @@ * Increase the time until a fuse goes off */ void -lengthen(int (*func)(), int xtime) +lengthen(void (*func)(), int xtime) { reg struct delayed_action *wire; @@ -136,7 +136,7 @@ * Put out a fuse. Find all such fuses and kill them. */ void -extinguish(int (*func)()) +extinguish(void (*func)()) { reg struct delayed_action *dev;