Mercurial > hg > early-roguelike

comparison xrogue/pack.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 f54901b9c39b
children e1cd27c5464f
comparison
equal deleted inserted replaced
235:2dcf10d45d5b 236:7c1cb43f346e
257 switch (obj->o_which) { 257 switch (obj->o_which) {
258 /* the ankh of Heil gives you prayers */ 258 /* the ankh of Heil gives you prayers */
259 case HEIL_ANKH: 259 case HEIL_ANKH:
260 msg("The ankh welds itself into your hand. "); 260 msg("The ankh welds itself into your hand. ");
261 if (player.t_ctype != C_CLERIC && player.t_ctype != C_PALADIN) 261 if (player.t_ctype != C_CLERIC && player.t_ctype != C_PALADIN)
262 fuse(prayer_recovery, (VOID *)NULL, SPELLTIME, AFTER); 262 fuse(prayer_recovery, NULL, SPELLTIME, AFTER);
263 /* start a fuse to change player into a paladin */ 263 /* start a fuse to change player into a paladin */
264 if (quest_item != HEIL_ANKH) { 264 if (quest_item != HEIL_ANKH) {
265 msg("You hear a strange, distant hypnotic calling... "); 265 msg("You hear a strange, distant hypnotic calling... ");
266 if (player.t_ctype != C_PALADIN && obj->o_which ==HEIL_ANKH) 266 if (player.t_ctype != C_PALADIN && obj->o_which ==HEIL_ANKH)
267 fuse(changeclass, &paladin, roll(8, 8), AFTER); 267 fuse(changeclass, &paladin, roll(8, 8), AFTER);
334 if (player.t_ctype != C_ASSASSIN && obj->o_which == EYE_VECNA) 334 if (player.t_ctype != C_ASSASSIN && obj->o_which == EYE_VECNA)
335 fuse(changeclass, &assassin, roll(8, 8), AFTER); 335 fuse(changeclass, &assassin, roll(8, 8), AFTER);
336 } 336 }
337 337
338 when QUILL_NAGROM: 338 when QUILL_NAGROM:
339 fuse(quill_charge,(VOID *)NULL, 8, AFTER); 339 fuse(quill_charge, NULL, 8, AFTER);
340 /* start a fuse to change player into a druid */ 340 /* start a fuse to change player into a druid */
341 if (quest_item != QUILL_NAGROM) { 341 if (quest_item != QUILL_NAGROM) {
342 msg("You begin to see things differently... "); 342 msg("You begin to see things differently... ");
343 if (player.t_ctype != C_DRUID && obj->o_which == QUILL_NAGROM) 343 if (player.t_ctype != C_DRUID && obj->o_which == QUILL_NAGROM)
344 fuse(changeclass, &druid, roll(8, 8), AFTER); 344 fuse(changeclass, &druid, roll(8, 8), AFTER);