From 41d89521a1b2181178dc49233543613b5646ee99 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 13 Mar 2019 07:43:10 -1100 Subject: [PATCH] -file fp --- src/cc/rogue/armor.c | 4 ++-- src/cc/rogue/command.c | 4 ++-- src/cc/rogue/daemon.c | 10 +++++----- src/cc/rogue/rogue.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cc/rogue/armor.c b/src/cc/rogue/armor.c index f8c491121..20c5704a8 100644 --- a/src/cc/rogue/armor.c +++ b/src/cc/rogue/armor.c @@ -83,7 +83,7 @@ void waste_time(struct rogue_state *rs) { do_daemons(rs,BEFORE); - do_fuses(rs,BEFORE,0); + do_fuses(rs,BEFORE); do_daemons(rs,AFTER); - do_fuses(rs,AFTER,0); + do_fuses(rs,AFTER); } diff --git a/src/cc/rogue/command.c b/src/cc/rogue/command.c index 830fa2356..568f4b8f8 100644 --- a/src/cc/rogue/command.c +++ b/src/cc/rogue/command.c @@ -31,7 +31,7 @@ command(struct rogue_state *rs) * Let the daemons start up */ do_daemons(rs,BEFORE); - do_fuses(rs,BEFORE,0); + do_fuses(rs,BEFORE); while (ntimes--) { if ( rs->replaydone != 0 ) @@ -466,7 +466,7 @@ over: ntimes++; } do_daemons(rs,AFTER); - do_fuses(rs,AFTER,0); + do_fuses(rs,AFTER); if (ISRING(LEFT, R_SEARCH)) search(rs); else if (ISRING(LEFT, R_TELEPORT) && rnd(50) == 0) diff --git a/src/cc/rogue/daemon.c b/src/cc/rogue/daemon.c index c98b10f88..81bdd0a73 100644 --- a/src/cc/rogue/daemon.c +++ b/src/cc/rogue/daemon.c @@ -161,7 +161,7 @@ extinguish(void (*func)(struct rogue_state *rs,int)) * Decrement counters and start needed fuses */ -char *actionfunc_str(char *str,void *ptr) +/*char *actionfunc_str(char *str,void *ptr) { if ( ptr == (void *)runners ) strcpy(str,"runners"); @@ -191,10 +191,10 @@ char *actionfunc_str(char *str,void *ptr) strcpy(str,"turn_see"); else strcpy(str,"no match"); return(str); -} +}*/ void -do_fuses(struct rogue_state *rs,int flag,FILE *fp) +do_fuses(struct rogue_state *rs,int flag) { register struct delayed_action *wire; char str[64]; @@ -208,8 +208,8 @@ do_fuses(struct rogue_state *rs,int flag,FILE *fp) */ if (flag == wire->d_type && wire->d_time > 0 && --wire->d_time == 0) { - if ( fp != 0 ) - fprintf(fp,"t.%d %d %s, ",wire->d_type,wire->d_time,actionfunc_str(str,wire->d_func)); + //if ( fp != 0 ) + // fprintf(fp,"t.%d %d %s, ",wire->d_type,wire->d_time,actionfunc_str(str,wire->d_func)); wire->d_type = EMPTY; (*wire->d_func)(rs,wire->d_arg); } diff --git a/src/cc/rogue/rogue.h b/src/cc/rogue/rogue.h index 2a5b39bf9..5540da2da 100644 --- a/src/cc/rogue/rogue.h +++ b/src/cc/rogue/rogue.h @@ -620,7 +620,7 @@ int dist(int y1, int x1, int y2, int x2); int dist_cp(coord *c1, coord *c2); int do_chase(struct rogue_state *rs,THING *th); void do_daemons(struct rogue_state *rs,int flag); -void do_fuses(struct rogue_state *rs,int flag,FILE *fp); +void do_fuses(struct rogue_state *rs,int flag); void do_maze(struct rogue_state *rs,struct room *rp); void do_motion(struct rogue_state *rs,THING *obj, int ydelta, int xdelta); void do_move(struct rogue_state *rs,int dy, int dx);