DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

-file fp

Browse Source
This commit is contained in:
jl777
2019-03-13 07:43:10 -11:00
parent 7a04cea145
commit 41d89521a1
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/rogue/armor.c
View File

@@ -83,7 +83,7 @@ void
waste_time(struct rogue_state *rs) waste_time(struct rogue_state *rs)
{ {
do_daemons(rs,BEFORE); do_daemons(rs,BEFORE);
do_fuses(rs,BEFORE,0); do_fuses(rs,BEFORE);
do_daemons(rs,AFTER); do_daemons(rs,AFTER);
do_fuses(rs,AFTER,0); do_fuses(rs,AFTER);
} }

4
src/cc/rogue/command.c
View File

@@ -31,7 +31,7 @@ command(struct rogue_state *rs)
* Let the daemons start up * Let the daemons start up
*/ */
do_daemons(rs,BEFORE); do_daemons(rs,BEFORE);
do_fuses(rs,BEFORE,0); do_fuses(rs,BEFORE);
while (ntimes--) while (ntimes--)
{ {
if ( rs->replaydone != 0 ) if ( rs->replaydone != 0 )
@@ -466,7 +466,7 @@ over:
ntimes++; ntimes++;
} }
do_daemons(rs,AFTER); do_daemons(rs,AFTER);
do_fuses(rs,AFTER,0); do_fuses(rs,AFTER);
if (ISRING(LEFT, R_SEARCH)) if (ISRING(LEFT, R_SEARCH))
search(rs); search(rs);
else if (ISRING(LEFT, R_TELEPORT) && rnd(50) == 0) else if (ISRING(LEFT, R_TELEPORT) && rnd(50) == 0)

10
src/cc/rogue/daemon.c
View File

@@ -161,7 +161,7 @@ extinguish(void (*func)(struct rogue_state *rs,int))
* Decrement counters and start needed fuses * Decrement counters and start needed fuses
*/ */
char *actionfunc_str(char *str,void *ptr) /*char *actionfunc_str(char *str,void *ptr)
{ {
if ( ptr == (void *)runners ) if ( ptr == (void *)runners )
strcpy(str,"runners"); strcpy(str,"runners");
@@ -191,10 +191,10 @@ char *actionfunc_str(char *str,void *ptr)
strcpy(str,"turn_see"); strcpy(str,"turn_see");
else strcpy(str,"no match"); else strcpy(str,"no match");
return(str); return(str);
} }*/
void 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]; 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 (flag == wire->d_type && wire->d_time > 0 && --wire->d_time == 0)
{ {
if ( fp != 0 ) //if ( fp != 0 )
fprintf(fp,"t.%d %d %s, ",wire->d_type,wire->d_time,actionfunc_str(str,wire->d_func)); // fprintf(fp,"t.%d %d %s, ",wire->d_type,wire->d_time,actionfunc_str(str,wire->d_func));
wire->d_type = EMPTY; wire->d_type = EMPTY;
(*wire->d_func)(rs,wire->d_arg); (*wire->d_func)(rs,wire->d_arg);
} }

2
src/cc/rogue/rogue.h
View File

@@ -620,7 +620,7 @@ int dist(int y1, int x1, int y2, int x2);
int dist_cp(coord *c1, coord *c2); int dist_cp(coord *c1, coord *c2);
int do_chase(struct rogue_state *rs,THING *th); int do_chase(struct rogue_state *rs,THING *th);
void do_daemons(struct rogue_state *rs,int flag); 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_maze(struct rogue_state *rs,struct room *rp);
void do_motion(struct rogue_state *rs,THING *obj, int ydelta, int xdelta); void do_motion(struct rogue_state *rs,THING *obj, int ydelta, int xdelta);
void do_move(struct rogue_state *rs,int dy, int dx); void do_move(struct rogue_state *rs,int dy, int dx);