Mercurial > hg > early-roguelike

comparison xrogue/main.c @ 151:cadff8f047a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arogue7, xrogue: rename daemon() to start_daemon(). This prevents conflict with the BSD/OSX daemon() system function.
author John "Elwin" Edwards
date Thu, 28 May 2015 10:21:43 -0400
parents 301ed6992c2e
children f54901b9c39b
comparison
equal deleted inserted replaced
150:a307ff9cd95e 151:cadff8f047a1
238 new_level(STARTLEV); /* Draw current level */ 238 new_level(STARTLEV); /* Draw current level */
239 239
240 /* 240 /*
241 * Start up daemons and fuses 241 * Start up daemons and fuses
242 */ 242 */
243 daemon(doctor, &player, AFTER); 243 start_daemon(doctor, &player, AFTER);
244 fuse(swander, (VOID *)NULL, WANDERTIME, AFTER); 244 fuse(swander, (VOID *)NULL, WANDERTIME, AFTER);
245 /* Give characters their innate abilities */ 245 /* Give characters their innate abilities */
246 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER) 246 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER)
247 fuse(spell_recovery, (VOID *)NULL, SPELLTIME, AFTER); 247 fuse(spell_recovery, (VOID *)NULL, SPELLTIME, AFTER);
248 if (player.t_ctype == C_DRUID || player.t_ctype == C_MONK) 248 if (player.t_ctype == C_DRUID || player.t_ctype == C_MONK)
249 fuse(chant_recovery, (VOID *)NULL, SPELLTIME, AFTER); 249 fuse(chant_recovery, (VOID *)NULL, SPELLTIME, AFTER);
250 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN) 250 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN)
251 fuse(prayer_recovery, (VOID *)NULL, SPELLTIME, AFTER); 251 fuse(prayer_recovery, (VOID *)NULL, SPELLTIME, AFTER);
252 daemon(stomach, (VOID *)NULL, AFTER); 252 start_daemon(stomach, (VOID *)NULL, AFTER);
253 if (player.t_ctype == C_THIEF || 253 if (player.t_ctype == C_THIEF ||
254 player.t_ctype == C_ASSASSIN || 254 player.t_ctype == C_ASSASSIN ||
255 player.t_ctype == C_MONK) 255 player.t_ctype == C_MONK)
256 daemon(trap_look, (VOID *)NULL, AFTER); 256 start_daemon(trap_look, (VOID *)NULL, AFTER);
257 257
258 /* Does this character have any special knowledge? */ 258 /* Does this character have any special knowledge? */
259 switch (player.t_ctype) { 259 switch (player.t_ctype) {
260 case C_ASSASSIN: 260 case C_ASSASSIN:
261 /* Assassins automatically recognize poison */ 261 /* Assassins automatically recognize poison */