Mercurial > hg > early-roguelike

comparison xrogue/rogue.h @ 134:cfa9d1609b78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xrogue: fix definition of struct delayed_action. 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.
author John "Elwin" Edwards
date Tue, 21 Apr 2015 10:11:02 -0400
parents e6179860cb76
children 1fbdefa82533
comparison
equal deleted inserted replaced
133:e6179860cb76 134:cfa9d1609b78
924 #define ALTERAN_CARD 16 924 #define ALTERAN_CARD 16
925 #define MAXRELIC 17 925 #define MAXRELIC 17
926 926
927 #define MAXDAEMONS 10 927 #define MAXDAEMONS 10
928 #define MAXFUSES 20 928 #define MAXFUSES 20
929
930 struct delayed_action {
931 int d_type;
932 int (*d_func)();
933 union {
934 VOID *vp;
935 int i;
936 } d_arg;
937 int d_time;
938 };
929 939
930 extern struct delayed_action d_list[MAXDAEMONS]; 940 extern struct delayed_action d_list[MAXDAEMONS];
931 extern struct delayed_action f_list[MAXFUSES]; 941 extern struct delayed_action f_list[MAXFUSES];
932 extern int demoncnt; /* number of active daemons */ 942 extern int demoncnt; /* number of active daemons */
933 extern int fusecnt; 943 extern int fusecnt;