warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename daemon() to start_daemon().

Browse source 
daemon() conflicted with the standard library function, which is
included by default on OS X.
This commit is contained in:
John "Elwin" Edwards 2013-09-07 08:08:00 -04:00
parent 05b8759305
commit 720d587422
12 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arogue5/daemon.c
View file

@ -84,10 +84,10 @@ reg int (*func)();
/* /*
* daemon: * start_daemon:
* Start a daemon, takes a function. * Start a daemon, takes a function.
*/ */
daemon(func, arg, type) start_daemon(func, arg, type)
reg int arg, type, (*func)(); reg int arg, type, (*func)();
{ {
reg struct delayed_action *dev; reg struct delayed_action *dev;

2
arogue5/daemons.c
View file

@ -102,7 +102,7 @@ register struct thing *tp;
swander() swander()
{ {
daemon(rollwand, 0, BEFORE); start_daemon(rollwand, 0, BEFORE);
} }
/* /*

8
arogue5/main.c
View file

@ -227,12 +227,12 @@ char **envp;
/* /*
* Start up daemons and fuses * Start up daemons and fuses
*/ */
daemon(doctor, &player, AFTER); start_daemon(doctor, &player, AFTER);
fuse(swander, 0, WANDERTIME, AFTER); fuse(swander, 0, WANDERTIME, AFTER);
daemon(stomach, 0, AFTER); start_daemon(stomach, 0, AFTER);
daemon(runners, 0, AFTER); start_daemon(runners, 0, AFTER);
if (player.t_ctype == C_THIEF) if (player.t_ctype == C_THIEF)
daemon(trap_look, 0, AFTER); start_daemon(trap_look, 0, AFTER);
/* Choose a quest item */ /* Choose a quest item */
quest_item = rnd(MAXRELIC); quest_item = rnd(MAXRELIC);

2
arogue5/misc.c
View file

@ -702,7 +702,7 @@ int which;
* if he becomes a thief then add the trap_look() daemon * if he becomes a thief then add the trap_look() daemon
*/ */
if (obj->o_ac == C_THIEF) 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; char_type = player.t_ctype = obj->o_ac;
save = pstats.s_hpt; save = pstats.s_hpt;
max_stats.s_hpt = pstats.s_hpt = 0; max_stats.s_hpt = pstats.s_hpt = 0;

4
arogue5/rings.c
View file

@ -84,9 +84,9 @@ register struct object *obj;
} }
} }
when R_SEARCH: when R_SEARCH:
daemon(ring_search, 0, AFTER); start_daemon(ring_search, 0, AFTER);
when R_TELEPORT: when R_TELEPORT:
daemon(ring_teleport, 0, AFTER); start_daemon(ring_teleport, 0, AFTER);
} }
status(FALSE); status(FALSE);
if (r_know[obj->o_which] && r_guess[obj->o_which]) if (r_know[obj->o_which] && r_guess[obj->o_which])

4
arogue5/wear.c
View file

@ -179,7 +179,7 @@ wear()
msg("wearing %s",inv_name(obj,TRUE)); msg("wearing %s",inv_name(obj,TRUE));
cur_misc[WEAR_GAUNTLET] = obj; cur_misc[WEAR_GAUNTLET] = obj;
if (obj->o_which == MM_FUMBLE) if (obj->o_which == MM_FUMBLE)
daemon(fumble, 0, AFTER); start_daemon(fumble, 0, AFTER);
} }
/* /*
* the jewel of attacks does an aggavate monster * the jewel of attacks does an aggavate monster
@ -215,7 +215,7 @@ wear()
msg("wearing %s",inv_name(obj,TRUE)); msg("wearing %s",inv_name(obj,TRUE));
cur_misc[WEAR_NECKLACE] = obj; cur_misc[WEAR_NECKLACE] = obj;
msg("The necklace is beginning to strangle you!"); msg("The necklace is beginning to strangle you!");
daemon(strangle, 0, AFTER); start_daemon(strangle, 0, AFTER);
} }
otherwise: otherwise:
msg("what a strange item you have!"); msg("what a strange item you have!");

4
rogue4/daemon.c
View file

@ -61,10 +61,10 @@ register int (*func)();
} }
/* /*
* daemon: * start_daemon:
* Start a daemon, takes a function. * Start a daemon, takes a function.
*/ */
daemon(func, arg, type) start_daemon(func, arg, type)
int (*func)(), arg, type; int (*func)(), arg, type;
{ {
register struct delayed_action *dev; register struct delayed_action *dev;

2
rogue4/daemons.c
View file

@ -52,7 +52,7 @@ doctor()
*/ */
swander() swander()
{ {
daemon(rollwand, 0, BEFORE); start_daemon(rollwand, 0, BEFORE);
} }
/* /*

6
rogue4/main.c
View file

@ -206,10 +206,10 @@ char **envp;
/* /*
* Start up daemons and fuses * Start up daemons and fuses
*/ */
daemon(doctor, 0, AFTER); start_daemon(doctor, 0, AFTER);
fuse(swander, 0, WANDERTIME, AFTER); fuse(swander, 0, WANDERTIME, AFTER);
daemon(stomach, 0, AFTER); start_daemon(stomach, 0, AFTER);
daemon(runners, 0, AFTER); start_daemon(runners, 0, AFTER);
playit(); playit();
} }

4
srogue/daemon.c
View file

@ -85,10 +85,10 @@ int (*func)();
} }
/* /*
* daemon: * start_daemon:
* Start a daemon, takes a function. * Start a daemon, takes a function.
*/ */
daemon(func, arg, type) start_daemon(func, arg, type)
int arg, type, (*func)(); int arg, type, (*func)();
{ {
d_insert(func, arg, type, DAEMON); d_insert(func, arg, type, DAEMON);

2
srogue/daemons.c
View file

@ -66,7 +66,7 @@ int fromfuse;
swander(fromfuse) swander(fromfuse)
int fromfuse; int fromfuse;
{ {
daemon(rollwand, TRUE, AFTER); start_daemon(rollwand, TRUE, AFTER);
} }

8
srogue/main.c
View file

@ -243,15 +243,15 @@ char **envp;
/* Start up daemons and fuses */ /* Start up daemons and fuses */
daemon(status, TRUE, BEFORE); start_daemon(status, TRUE, BEFORE);
daemon(runners, TRUE, AFTER); start_daemon(runners, TRUE, AFTER);
/* /*
* These daemons have been moved to AFTER because BEFORE daemons * These daemons have been moved to AFTER because BEFORE daemons
* get called every command, even invalid ones. Hopefully this * get called every command, even invalid ones. Hopefully this
* won't break anything. * won't break anything.
*/ */
daemon(doctor, TRUE, AFTER); start_daemon(doctor, TRUE, AFTER);
daemon(stomach, TRUE, AFTER); start_daemon(stomach, TRUE, AFTER);
fuse(swander, TRUE, WANDERTIME); fuse(swander, TRUE, WANDERTIME);
/* Give the rogue his weaponry */ /* Give the rogue his weaponry */