Mercurial > hg > early-roguelike
comparison xrogue/state.c @ 134:cfa9d1609b78
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 | ce0cf824c192 |
comparison
equal
deleted
inserted
replaced
133:e6179860cb76 | 134:cfa9d1609b78 |
---|---|
956 rs_read_int(inf,&c->x); | 956 rs_read_int(inf,&c->x); |
957 rs_read_int(inf,&c->y); | 957 rs_read_int(inf,&c->y); |
958 | 958 |
959 return(READSTAT); | 959 return(READSTAT); |
960 } | 960 } |
961 | |
962 struct delayed_action { | |
963 int d_type; | |
964 int (*d_func)(); | |
965 union { | |
966 VOID *vp; | |
967 int i; | |
968 } d_arg; | |
969 int d_time; | |
970 }; | |
971 | 961 |
972 rs_write_daemons(FILE *savef, struct delayed_action *d_list,int count) | 962 rs_write_daemons(FILE *savef, struct delayed_action *d_list,int count) |
973 { | 963 { |
974 int i = 0; | 964 int i = 0; |
975 int func = 0; | 965 int func = 0; |