comparison arogue7/main.c @ 151:cadff8f047a1

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 f9ef86cf22b2
comparison
equal deleted inserted replaced
150:a307ff9cd95e 151:cadff8f047a1
381 #endif 381 #endif
382 new_level(STARTLEV); /* Draw current level */ 382 new_level(STARTLEV); /* Draw current level */
383 /* 383 /*
384 * Start up daemons and fuses 384 * Start up daemons and fuses
385 */ 385 */
386 daemon(doctor, &player, AFTER); 386 start_daemon(doctor, &player, AFTER);
387 fuse(swander, 0, WANDERTIME, AFTER); 387 fuse(swander, 0, WANDERTIME, AFTER);
388 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER) 388 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER)
389 fuse(spell_recovery, 0, SPELLTIME, AFTER); 389 fuse(spell_recovery, 0, SPELLTIME, AFTER);
390 if (player.t_ctype == C_DRUID || player.t_ctype == C_RANGER) 390 if (player.t_ctype == C_DRUID || player.t_ctype == C_RANGER)
391 fuse(chant_recovery, 0, SPELLTIME, AFTER); 391 fuse(chant_recovery, 0, SPELLTIME, AFTER);
392 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN) 392 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN)
393 fuse(prayer_recovery, 0, SPELLTIME, AFTER); 393 fuse(prayer_recovery, 0, SPELLTIME, AFTER);
394 daemon(stomach, 0, AFTER); 394 start_daemon(stomach, 0, AFTER);
395 if (player.t_ctype == C_THIEF || 395 if (player.t_ctype == C_THIEF ||
396 player.t_ctype == C_ASSASIN || 396 player.t_ctype == C_ASSASIN ||
397 player.t_ctype == C_MONK) 397 player.t_ctype == C_MONK)
398 daemon(trap_look, 0, AFTER); 398 start_daemon(trap_look, 0, AFTER);
399 399
400 /* Does this character have any special knowledge? */ 400 /* Does this character have any special knowledge? */
401 switch (player.t_ctype) { 401 switch (player.t_ctype) {
402 case C_ASSASIN: 402 case C_ASSASIN:
403 /* Assassins automatically recognize poison */ 403 /* Assassins automatically recognize poison */