diff --git a/arogue5/daemon.c b/arogue5/daemon.c index 6bdde96..3ac1220 100644 --- a/arogue5/daemon.c +++ b/arogue5/daemon.c @@ -84,10 +84,10 @@ reg int (*func)(); /* - * daemon: + * start_daemon: * Start a daemon, takes a function. */ -daemon(func, arg, type) +start_daemon(func, arg, type) reg int arg, type, (*func)(); { reg struct delayed_action *dev; diff --git a/arogue5/daemons.c b/arogue5/daemons.c index e583896..84b25d2 100644 --- a/arogue5/daemons.c +++ b/arogue5/daemons.c @@ -102,7 +102,7 @@ register struct thing *tp; swander() { - daemon(rollwand, 0, BEFORE); + start_daemon(rollwand, 0, BEFORE); } /* diff --git a/arogue5/main.c b/arogue5/main.c index 7f3f42f..c581c25 100644 --- a/arogue5/main.c +++ b/arogue5/main.c @@ -227,12 +227,12 @@ char **envp; /* * Start up daemons and fuses */ - daemon(doctor, &player, AFTER); + start_daemon(doctor, &player, AFTER); fuse(swander, 0, WANDERTIME, AFTER); - daemon(stomach, 0, AFTER); - daemon(runners, 0, AFTER); + start_daemon(stomach, 0, AFTER); + start_daemon(runners, 0, AFTER); if (player.t_ctype == C_THIEF) - daemon(trap_look, 0, AFTER); + start_daemon(trap_look, 0, AFTER); /* Choose a quest item */ quest_item = rnd(MAXRELIC); diff --git a/arogue5/misc.c b/arogue5/misc.c index ba47704..b13785f 100644 --- a/arogue5/misc.c +++ b/arogue5/misc.c @@ -702,7 +702,7 @@ int which; * if he becomes a thief then add the trap_look() daemon */ if (obj->o_ac == C_THIEF) - daemon(trap_look, 0, AFTER); + start_daemon(trap_look, 0, AFTER); char_type = player.t_ctype = obj->o_ac; save = pstats.s_hpt; max_stats.s_hpt = pstats.s_hpt = 0; diff --git a/arogue5/rings.c b/arogue5/rings.c index 20d718c..ab54732 100644 --- a/arogue5/rings.c +++ b/arogue5/rings.c @@ -84,9 +84,9 @@ register struct object *obj; } } when R_SEARCH: - daemon(ring_search, 0, AFTER); + start_daemon(ring_search, 0, AFTER); when R_TELEPORT: - daemon(ring_teleport, 0, AFTER); + start_daemon(ring_teleport, 0, AFTER); } status(FALSE); if (r_know[obj->o_which] && r_guess[obj->o_which]) diff --git a/arogue5/wear.c b/arogue5/wear.c index 337e0a1..19866e9 100644 --- a/arogue5/wear.c +++ b/arogue5/wear.c @@ -179,7 +179,7 @@ wear() msg("wearing %s",inv_name(obj,TRUE)); cur_misc[WEAR_GAUNTLET] = obj; if (obj->o_which == MM_FUMBLE) - daemon(fumble, 0, AFTER); + start_daemon(fumble, 0, AFTER); } /* * the jewel of attacks does an aggavate monster @@ -215,7 +215,7 @@ wear() msg("wearing %s",inv_name(obj,TRUE)); cur_misc[WEAR_NECKLACE] = obj; msg("The necklace is beginning to strangle you!"); - daemon(strangle, 0, AFTER); + start_daemon(strangle, 0, AFTER); } otherwise: msg("what a strange item you have!"); diff --git a/rogue4/daemon.c b/rogue4/daemon.c index 5ca43a1..00aad6c 100644 --- a/rogue4/daemon.c +++ b/rogue4/daemon.c @@ -61,10 +61,10 @@ register int (*func)(); } /* - * daemon: + * start_daemon: * Start a daemon, takes a function. */ -daemon(func, arg, type) +start_daemon(func, arg, type) int (*func)(), arg, type; { register struct delayed_action *dev; diff --git a/rogue4/daemons.c b/rogue4/daemons.c index 4b7c767..b88a313 100644 --- a/rogue4/daemons.c +++ b/rogue4/daemons.c @@ -52,7 +52,7 @@ doctor() */ swander() { - daemon(rollwand, 0, BEFORE); + start_daemon(rollwand, 0, BEFORE); } /* diff --git a/rogue4/main.c b/rogue4/main.c index e0e904c..e439e0c 100644 --- a/rogue4/main.c +++ b/rogue4/main.c @@ -206,10 +206,10 @@ char **envp; /* * Start up daemons and fuses */ - daemon(doctor, 0, AFTER); + start_daemon(doctor, 0, AFTER); fuse(swander, 0, WANDERTIME, AFTER); - daemon(stomach, 0, AFTER); - daemon(runners, 0, AFTER); + start_daemon(stomach, 0, AFTER); + start_daemon(runners, 0, AFTER); playit(); } diff --git a/srogue/daemon.c b/srogue/daemon.c index 6eee5ae..f405990 100644 --- a/srogue/daemon.c +++ b/srogue/daemon.c @@ -85,10 +85,10 @@ int (*func)(); } /* - * daemon: + * start_daemon: * Start a daemon, takes a function. */ -daemon(func, arg, type) +start_daemon(func, arg, type) int arg, type, (*func)(); { d_insert(func, arg, type, DAEMON); diff --git a/srogue/daemons.c b/srogue/daemons.c index 46417bf..6599ef9 100644 --- a/srogue/daemons.c +++ b/srogue/daemons.c @@ -66,7 +66,7 @@ int fromfuse; swander(fromfuse) int fromfuse; { - daemon(rollwand, TRUE, AFTER); + start_daemon(rollwand, TRUE, AFTER); } diff --git a/srogue/main.c b/srogue/main.c index c80230e..aebecb4 100644 --- a/srogue/main.c +++ b/srogue/main.c @@ -243,15 +243,15 @@ char **envp; /* Start up daemons and fuses */ - daemon(status, TRUE, BEFORE); - daemon(runners, TRUE, AFTER); + start_daemon(status, TRUE, BEFORE); + start_daemon(runners, TRUE, AFTER); /* * These daemons have been moved to AFTER because BEFORE daemons * get called every command, even invalid ones. Hopefully this * won't break anything. */ - daemon(doctor, TRUE, AFTER); - daemon(stomach, TRUE, AFTER); + start_daemon(doctor, TRUE, AFTER); + start_daemon(stomach, TRUE, AFTER); fuse(swander, TRUE, WANDERTIME); /* Give the rogue his weaponry */