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:
John "Elwin" Edwards
parent
6dfde944f0
commit
0a354903e0
14 changed files with 91 additions and 96 deletions
|
|
@ -74,7 +74,7 @@ f_slot(void)
|
|||
*/
|
||||
|
||||
struct delayed_action *
|
||||
find_slot(int (*func)())
|
||||
find_slot(void (*func)())
|
||||
{
|
||||
reg int i;
|
||||
reg struct delayed_action *dev;
|
||||
|
|
@ -91,7 +91,7 @@ find_slot(int (*func)())
|
|||
*/
|
||||
|
||||
void
|
||||
start_daemon(int (*dfunc)(), VOID *arg, int type)
|
||||
start_daemon(void (*dfunc)(), VOID *arg, int type)
|
||||
{
|
||||
reg struct delayed_action *dev;
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ start_daemon(int (*dfunc)(), VOID *arg, int type)
|
|||
*/
|
||||
|
||||
void
|
||||
kill_daemon(int (*dfunc)())
|
||||
kill_daemon(void (*dfunc)())
|
||||
{
|
||||
reg struct delayed_action *dev;
|
||||
reg int i;
|
||||
|
|
@ -164,7 +164,7 @@ do_daemons(int flag)
|
|||
*/
|
||||
|
||||
void
|
||||
fuse(int (*dfunc)(), VOID *arg, int time, int type)
|
||||
fuse(void (*dfunc)(), VOID *arg, int time, int type)
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ fuse(int (*dfunc)(), VOID *arg, int time, int type)
|
|||
*/
|
||||
|
||||
void
|
||||
lengthen(int (*dfunc)(), int xtime)
|
||||
lengthen(void (*dfunc)(), int xtime)
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
@ -199,7 +199,7 @@ lengthen(int (*dfunc)(), int xtime)
|
|||
*/
|
||||
|
||||
void
|
||||
extinguish(int (*dfunc)())
|
||||
extinguish(void (*dfunc)())
|
||||
{
|
||||
reg struct delayed_action *wire;
|
||||
|
||||
|
|
|
|||
|
|
@ -222,13 +222,12 @@ unphase(void)
|
|||
* Player can no longer fly
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
land(void)
|
||||
{
|
||||
turn_off(player, ISFLY);
|
||||
msg("You regain your normal weight");
|
||||
running = FALSE;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -253,7 +252,7 @@ sight(void)
|
|||
* Restore player's strength
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_strength(long howmuch)
|
||||
{
|
||||
|
||||
|
|
@ -271,7 +270,6 @@ res_strength(long howmuch)
|
|||
min(pstats.s_str + howmuch, max_stats.s_str + ring_value(R_ADDSTR));
|
||||
|
||||
updpack(TRUE, &player);
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -507,12 +505,11 @@ alchemy(struct object *obj)
|
|||
* otto's irresistable dance wears off
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
undance(void)
|
||||
{
|
||||
turn_off(player, ISDANCE);
|
||||
msg ("Your feet take a break.....whew!");
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -637,12 +634,11 @@ unskill(void)
|
|||
* charge up the cloak of Emori
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
cloak_charge(struct object *obj)
|
||||
{
|
||||
if (obj->o_charges < 1)
|
||||
obj->o_charges = 1;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ int add_intelligence(int change);
|
|||
int add_strength(int change);
|
||||
int add_wisdom(int change);
|
||||
|
||||
int res_charisma(int howmuch);
|
||||
int res_constitution(int howmuch);
|
||||
int res_dexterity(int howmuch);
|
||||
int res_intelligence(int howmuch);
|
||||
int res_wisdom(int howmuch);
|
||||
void res_charisma(int howmuch);
|
||||
void res_constitution(int howmuch);
|
||||
void res_dexterity(int howmuch);
|
||||
void res_intelligence(int howmuch);
|
||||
void res_wisdom(int howmuch);
|
||||
|
||||
/*
|
||||
* add_abil is an array of functions used to change attributes. It must be
|
||||
|
|
@ -48,7 +48,7 @@ int (*add_abil[NUMABILITIES])() = {
|
|||
* ordered according to the attribute definitions in rogue.h.
|
||||
*/
|
||||
|
||||
int (*res_abil[NUMABILITIES])() = {
|
||||
void (*res_abil[NUMABILITIES])() = {
|
||||
res_intelligence, res_strength, res_wisdom, res_dexterity,
|
||||
res_constitution, res_charisma
|
||||
};
|
||||
|
|
@ -945,13 +945,13 @@ quaff(int which, int kind, int flags, bool is_potion)
|
|||
* if called with zero the restore fully
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_dexterity(int howmuch)
|
||||
{
|
||||
short save_max;
|
||||
int ring_str;
|
||||
|
||||
if (howmuch < 0) return(0);
|
||||
if (howmuch < 0) return;
|
||||
|
||||
/* Discount the ring value */
|
||||
ring_str = ring_value(R_ADDHIT);
|
||||
|
|
@ -970,7 +970,7 @@ res_dexterity(int howmuch)
|
|||
pstats.s_dext += ring_str;
|
||||
max_stats.s_dext = save_max;
|
||||
}
|
||||
return(0);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -978,13 +978,13 @@ res_dexterity(int howmuch)
|
|||
* Restore player's intelligence
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_intelligence(int howmuch)
|
||||
{
|
||||
short save_max;
|
||||
int ring_str;
|
||||
|
||||
if (howmuch <= 0) return(0);
|
||||
if (howmuch <= 0) return;
|
||||
|
||||
/* Discount the ring value */
|
||||
ring_str = ring_value(R_ADDINTEL);
|
||||
|
|
@ -998,7 +998,7 @@ res_intelligence(int howmuch)
|
|||
pstats.s_intel += ring_str;
|
||||
max_stats.s_intel = save_max;
|
||||
}
|
||||
return(0);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1006,13 +1006,13 @@ res_intelligence(int howmuch)
|
|||
* Restore player's wisdom
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_wisdom(int howmuch)
|
||||
{
|
||||
short save_max;
|
||||
int ring_str;
|
||||
|
||||
if (howmuch <= 0) return(0);
|
||||
if (howmuch <= 0) return;
|
||||
|
||||
/* Discount the ring value */
|
||||
ring_str = ring_value(R_ADDWISDOM);
|
||||
|
|
@ -1026,7 +1026,7 @@ res_wisdom(int howmuch)
|
|||
pstats.s_wisdom += ring_str;
|
||||
max_stats.s_wisdom = save_max;
|
||||
}
|
||||
return(0);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1034,13 +1034,13 @@ res_wisdom(int howmuch)
|
|||
* Restore the players constitution.
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_constitution(int howmuch)
|
||||
{
|
||||
if (howmuch > 0)
|
||||
pstats.s_const = min(pstats.s_const + howmuch, max_stats.s_const);
|
||||
|
||||
return(0);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1048,12 +1048,12 @@ res_constitution(int howmuch)
|
|||
* Restore the players charisma.
|
||||
*/
|
||||
|
||||
int
|
||||
void
|
||||
res_charisma(int howmuch)
|
||||
{
|
||||
if (howmuch > 0)
|
||||
pstats.s_charisma =
|
||||
min(pstats.s_charisma + howmuch, max_stats.s_charisma);
|
||||
|
||||
return(0);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -933,7 +933,7 @@
|
|||
|
||||
struct delayed_action {
|
||||
int d_type;
|
||||
int (*d_func)();
|
||||
void (*d_func)();
|
||||
union {
|
||||
VOID *vp;
|
||||
int i;
|
||||
|
|
@ -1258,7 +1258,7 @@ long check_level(void);
|
|||
void check_residue(struct thing *tp);
|
||||
void chg_str(int amt);
|
||||
void choose_qst(void);
|
||||
int cloak_charge(struct object *obj);
|
||||
void cloak_charge(struct object *obj);
|
||||
void command(void);
|
||||
void confus_player(void);
|
||||
int const_bonus(void);
|
||||
|
|
@ -1310,19 +1310,19 @@ void endit(int sig);
|
|||
void endmsg(void);
|
||||
void exit_game(int flag);
|
||||
void explode(struct thing *tp);
|
||||
void extinguish(int (*dfunc)());
|
||||
void extinguish(void (*dfunc)());
|
||||
void fall(struct linked_list *item, bool pr);
|
||||
coord *fallpos(coord *pos, bool be_clear, int range);
|
||||
void fatal(char *s);
|
||||
bool fight(coord *mp, struct object *weap, bool thrown);
|
||||
struct linked_list *find_mons(int y, int x);
|
||||
struct linked_list *find_obj(int y, int x);
|
||||
struct delayed_action *find_slot(int (*func)());
|
||||
struct delayed_action *find_slot(void (*func)());
|
||||
int findmindex(char *name);
|
||||
void fix_stick(struct object *cur);
|
||||
void fright(struct thing *th);
|
||||
void fumble(void);
|
||||
void fuse(int (*dfunc)(), VOID *arg, int time, int type);
|
||||
void fuse(void (*dfunc)(), VOID *arg, int time, int type);
|
||||
void genmonsters(int least, bool treas);
|
||||
coord get_coordinates(void);
|
||||
bool get_dir(coord *direction);
|
||||
|
|
@ -1359,10 +1359,10 @@ bool is_current(struct object *obj);
|
|||
bool is_magic(struct object *obj);
|
||||
bool isatrap(char ch);
|
||||
int itemweight(struct object *wh);
|
||||
void kill_daemon(int (*dfunc)());
|
||||
void kill_daemon(void (*dfunc)());
|
||||
void killed(struct linked_list *item, bool pr, bool points, bool treasure);
|
||||
int land(void);
|
||||
void lengthen(int (*dfunc)(), int xtime);
|
||||
void land(void);
|
||||
void lengthen(void (*dfunc)(), int xtime);
|
||||
void light(coord *cp);
|
||||
bool lit_room(struct room *rp);
|
||||
void look(bool wakeup, bool runend);
|
||||
|
|
@ -1415,7 +1415,7 @@ void raise_level(void);
|
|||
short randmonster(bool wander, bool no_unique);
|
||||
void read_scroll(int which, int flag, bool is_scroll);
|
||||
void reap(void);
|
||||
int res_strength(long howmuch);
|
||||
void res_strength(long howmuch);
|
||||
bool restore(char *file, char *envp[]);
|
||||
void restscr(WINDOW *scr);
|
||||
int ring_eat(int hand);
|
||||
|
|
@ -1452,7 +1452,7 @@ bool skirmish(struct thing *attacker, coord *mp, struct object *weap,
|
|||
bool thrown);
|
||||
struct linked_list *spec_item(int type, int which, int hit, int damage);
|
||||
void spell_recovery(void);
|
||||
void start_daemon(int (*dfunc)(), VOID *arg, int type);
|
||||
void start_daemon(void (*dfunc)(), VOID *arg, int type);
|
||||
void status(bool display);
|
||||
void steal(void);
|
||||
bool step_ok(int y, int x, int can_on_monst, struct thing *flgptr);
|
||||
|
|
@ -1475,7 +1475,7 @@ void trap_look(void);
|
|||
void unchoke(void);
|
||||
void unclrhead(void);
|
||||
void unconfuse(void);
|
||||
int undance(void);
|
||||
void undance(void);
|
||||
void unphase(void);
|
||||
void unsee(void);
|
||||
void unskill(void);
|
||||
|
|
@ -1648,7 +1648,6 @@ extern FILE *scorefi;
|
|||
extern FILE *logfile;
|
||||
extern LEVTYPE levtype;
|
||||
extern int (*add_abil[NUMABILITIES])(int); /* Functions to change abilities */
|
||||
extern int (*res_abil[NUMABILITIES])(); /* Functions to change abilities */
|
||||
extern int mf_count; /* move_free counter - see actions.c(m_act()) */
|
||||
extern int mf_jmpcnt; /* move_free counter for # of jumps */
|
||||
extern int killed_chance; /* cumulative chance for goodies to loose it, fight.c */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue