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

xrogue: fix definition of struct delayed_action.

Browse source 
Arrays of struct delayed_action were declared before the definition.
Also, daemon.c and state.c defined it differently.  The state.c
definition, in which d_arg is a union, is now used everywhere.

This is the least bad option, but fuses and daemons are still a
disheartening morass that undoubtedly shelters more bugs.
This commit is contained in:
John "Elwin" Edwards 2015-04-21 10:11:02 -04:00
parent 034d8d6484
commit 02cec53f85
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
xrogue/rogue.h
View file

@ -927,6 +927,16 @@
#define MAXDAEMONS 10
#define MAXFUSES 20
struct delayed_action {
int d_type;
int (*d_func)();
union {
VOID *vp;
int i;
} d_arg;
int d_time;
};
extern struct delayed_action d_list[MAXDAEMONS];
extern struct delayed_action f_list[MAXFUSES];
extern int demoncnt; /* number of active daemons */