Mercurial > hg > early-roguelike

comparison xrogue/daemons.c @ 236:7c1cb43f346e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
XRogue: get rid of VOID as an alias for long. Maybe some compilers in 1986 didn't handle void pointers well, but they are no longer a concern.
author John "Elwin" Edwards
date Mon, 07 Mar 2016 20:44:01 -0500
parents b67b99f6c92b
children 0250220d8cdd
comparison
equal deleted inserted replaced
235:2dcf10d45d5b 236:7c1cb43f346e
112 */ 112 */
113 113
114 void 114 void
115 swander(void) 115 swander(void)
116 { 116 {
117 start_daemon(rollwand, (VOID *)NULL, BEFORE); 117 start_daemon(rollwand, NULL, BEFORE);
118 } 118 }
119 119
120 /* 120 /*
121 * rollwand: 121 * rollwand:
122 * Called to roll to see if a wandering monster starts up 122 * Called to roll to see if a wandering monster starts up
135 ((player.t_ctype != C_THIEF && player.t_ctype != C_ASSASSIN) || 135 ((player.t_ctype != C_THIEF && player.t_ctype != C_ASSASSIN) ||
136 (rnd(30) >= dex_compute()))) { 136 (rnd(30) >= dex_compute()))) {
137 if (levtype != POSTLEV) 137 if (levtype != POSTLEV)
138 wanderer(); 138 wanderer();
139 kill_daemon(rollwand); 139 kill_daemon(rollwand);
140 fuse(swander, (VOID *)NULL, WANDERTIME, BEFORE); 140 fuse(swander, NULL, WANDERTIME, BEFORE);
141 } 141 }
142 between = 0; 142 between = 0;
143 } 143 }
144 } 144 }
145 145
610 } 610 }
611 if (item == NULL) 611 if (item == NULL)
612 return; 612 return;
613 if (tobj->o_charges < QUILLCHARGES) 613 if (tobj->o_charges < QUILLCHARGES)
614 tobj->o_charges++; 614 tobj->o_charges++;
615 fuse (quill_charge, (VOID *)NULL, player.t_ctype == C_MAGICIAN ? 4 : 8, AFTER); 615 fuse (quill_charge, NULL, player.t_ctype == C_MAGICIAN ? 4 : 8, AFTER);
616 } 616 }
617 617
618 /* 618 /*
619 * take the skills away gained (or lost) by the potion of skills 619 * take the skills away gained (or lost) by the potion of skills
620 */ 620 */
717 int time; 717 int time;
718 718
719 time = SPELLTIME - max(17-pstats.s_intel, 0); 719 time = SPELLTIME - max(17-pstats.s_intel, 0);
720 time = max(time, 5); 720 time = max(time, 5);
721 if (spell_power > 0) spell_power--; 721 if (spell_power > 0) spell_power--;
722 fuse(spell_recovery, (VOID *)NULL, time, AFTER); 722 fuse(spell_recovery, NULL, time, AFTER);
723 } 723 }
724 724
725 /* 725 /*
726 * give the hero back some prayer points 726 * give the hero back some prayer points
727 */ 727 */
732 int time; 732 int time;
733 733
734 time = SPELLTIME - max(17-pstats.s_wisdom, 0); 734 time = SPELLTIME - max(17-pstats.s_wisdom, 0);
735 time = max(time, 5); 735 time = max(time, 5);
736 if (pray_time > 0) pray_time--; 736 if (pray_time > 0) pray_time--;
737 fuse(prayer_recovery, (VOID *)NULL, time, AFTER); 737 fuse(prayer_recovery, NULL, time, AFTER);
738 } 738 }
739 739
740 /* 740 /*
741 * give the hero back some chant points 741 * give the hero back some chant points
742 */ 742 */
747 int time; 747 int time;
748 748
749 time = SPELLTIME - max(17-pstats.s_wisdom, 0); 749 time = SPELLTIME - max(17-pstats.s_wisdom, 0);
750 time = max(time, 5); 750 time = max(time, 5);
751 if (chant_time > 0) chant_time--; 751 if (chant_time > 0) chant_time--;
752 fuse(chant_recovery, (VOID *)NULL, time, AFTER); 752 fuse(chant_recovery, NULL, time, AFTER);
753 } 753 }
754 754