Mercurial > hg > early-roguelike
comparison xrogue/pack.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 | ce0cf824c192 |
children | f54901b9c39b |
comparison
equal
deleted
inserted
replaced
150:a307ff9cd95e | 151:cadff8f047a1 |
---|---|
353 if (obj->o_which == MUSTY_DAGGER || obj->o_which == AXE_AKLAD) { | 353 if (obj->o_which == MUSTY_DAGGER || obj->o_which == AXE_AKLAD) { |
354 if (purse > 0) msg("Your purse feels lighter! "); | 354 if (purse > 0) msg("Your purse feels lighter! "); |
355 else purse = 1; /* fudge to get right msg from eat_gold() */ | 355 else purse = 1; /* fudge to get right msg from eat_gold() */ |
356 | 356 |
357 eat_gold(obj); | 357 eat_gold(obj); |
358 daemon(eat_gold, obj, AFTER); | 358 start_daemon(eat_gold, obj, AFTER); |
359 } | 359 } |
360 /* start a fuse to change player into a thief */ | 360 /* start a fuse to change player into a thief */ |
361 if (quest_item != MUSTY_DAGGER) { | 361 if (quest_item != MUSTY_DAGGER) { |
362 if (player.t_ctype != C_THIEF && | 362 if (player.t_ctype != C_THIEF && |
363 obj->o_which == MUSTY_DAGGER) { | 363 obj->o_which == MUSTY_DAGGER) { |
433 msg("Got it! "); | 433 msg("Got it! "); |
434 if (purse > 0) msg("Your purse feels lighter! "); | 434 if (purse > 0) msg("Your purse feels lighter! "); |
435 else purse = 1; /* fudge to get right msg */ | 435 else purse = 1; /* fudge to get right msg */ |
436 | 436 |
437 eat_gold(obj); | 437 eat_gold(obj); |
438 daemon(eat_gold, obj, AFTER); | 438 start_daemon(eat_gold, obj, AFTER); |
439 } | 439 } |
440 } | 440 } |
441 else { | 441 else { |
442 msg("You accept it hesitantly... "); | 442 msg("You accept it hesitantly... "); |
443 if (purse > 0) msg("Your purse feels lighter! "); | 443 if (purse > 0) msg("Your purse feels lighter! "); |
444 else purse = 1; /* fudge to get right msg */ | 444 else purse = 1; /* fudge to get right msg */ |
445 | 445 |
446 eat_gold(obj); | 446 eat_gold(obj); |
447 daemon(eat_gold, obj, AFTER); | 447 start_daemon(eat_gold, obj, AFTER); |
448 } | 448 } |
449 | 449 |
450 otherwise: | 450 otherwise: |
451 break; | 451 break; |
452 } | 452 } |