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.
This commit is contained in:
parent
6dfde944f0
commit
0a354903e0
14 changed files with 91 additions and 96 deletions
|
|
@ -70,7 +70,7 @@ f_slot(void)
|
|||
* Find a particular slot in the table
|
||||
*/
|
||||
struct delayed_action *
|
||||
find_slot(int (*func)())
|
||||
find_slot(void (*func)())
|
||||
{
|
||||
reg int i;
|
||||
reg struct delayed_action *dev;
|
||||
|
|
@ -87,7 +87,7 @@ find_slot(int (*func)())
|
|||
* Start a daemon, takes a function.
|
||||
*/
|
||||
void
|
||||
start_daemon(int (*func)(), void *arg, int type)
|
||||
start_daemon(void (*func)(), void *arg, int type)
|
||||
{
|
||||
reg struct delayed_action *dev;
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ start_daemon(int (*func)(), void *arg, int type)
|
|||
* Remove a daemon from the list
|
||||
*/
|
||||
void
|
||||
kill_daemon(int (*func)())
|
||||
kill_daemon(void (*func)())
|
||||
{
|
||||
reg struct delayed_action *dev;
|
||||
reg int i;
|
||||
|
|
@ -155,7 +155,7 @@ do_daemons(int flag)
|
|||
* Start a fuse to go off in a certain number of turns
|
||||
*/
|
||||
void
|
||||
fuse(int (*func)(), void *arg, int time, int type)
|
||||
fuse(void (*func)(), void *arg, int time, int type)
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ fuse(int (*func)(), void *arg, int time, int type)
|
|||
* Increase the time until a fuse goes off
|
||||
*/
|
||||
void
|
||||
lengthen(int (*func)(), int xtime)
|
||||
lengthen(void (*func)(), int xtime)
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
@ -190,7 +190,7 @@ lengthen(int (*func)(), int xtime)
|
|||
* Put out a fuse
|
||||
*/
|
||||
void
|
||||
extinguish(int (*func)())
|
||||
extinguish(void (*func)())
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue