Mercurial > hg > early-roguelike
comparison xrogue/effects.c @ 236:7c1cb43f346e
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 |
|---|---|
| 307 msg("The stench of %s sickens you. Blech!", | 307 msg("The stench of %s sickens you. Blech!", |
| 308 prname(attname, FALSE)); | 308 prname(attname, FALSE)); |
| 309 if (on(player, HASSTINK)) lengthen(unstink, STINKTIME); | 309 if (on(player, HASSTINK)) lengthen(unstink, STINKTIME); |
| 310 else { | 310 else { |
| 311 turn_on(player, HASSTINK); | 311 turn_on(player, HASSTINK); |
| 312 fuse(unstink, (VOID *)NULL, STINKTIME, AFTER); | 312 fuse(unstink, NULL, STINKTIME, AFTER); |
| 313 } | 313 } |
| 314 } | 314 } |
| 315 } | 315 } |
| 316 | 316 |
| 317 /* | 317 /* |
| 322 if (!ISWEARING(R_SUSABILITY) && !save(VS_POISON, def, 0)) { | 322 if (!ISWEARING(R_SUSABILITY) && !save(VS_POISON, def, 0)) { |
| 323 msg("You cringe at %s's chilling touch.", | 323 msg("You cringe at %s's chilling touch.", |
| 324 prname(attname, FALSE)); | 324 prname(attname, FALSE)); |
| 325 chg_str(-1); | 325 chg_str(-1); |
| 326 if (lost_str++ == 0) | 326 if (lost_str++ == 0) |
| 327 fuse(res_strength, (VOID *)NULL, CHILLTIME, AFTER); | 327 fuse(res_strength, NULL, CHILLTIME, AFTER); |
| 328 else lengthen(res_strength, CHILLTIME); | 328 else lengthen(res_strength, CHILLTIME); |
| 329 } | 329 } |
| 330 } | 330 } |
| 331 | 331 |
| 332 /* | 332 /* |
| 357 player.t_ctype == C_RANGER) { | 357 player.t_ctype == C_RANGER) { |
| 358 msg("The wound heals quickly."); | 358 msg("The wound heals quickly."); |
| 359 } | 359 } |
| 360 else { | 360 else { |
| 361 turn_on(*def, HASDISEASE); | 361 turn_on(*def, HASDISEASE); |
| 362 fuse(cure_disease, (VOID *)NULL, roll(HEALTIME,SICKTIME), AFTER); | 362 fuse(cure_disease, NULL, roll(HEALTIME,SICKTIME), AFTER); |
| 363 msg(terse ? "You have been diseased!" | 363 msg(terse ? "You have been diseased!" |
| 364 : "You have contracted an annoying disease!"); | 364 : "You have contracted an annoying disease!"); |
| 365 } | 365 } |
| 366 } | 366 } |
| 367 | 367 |
| 489 def->t_action != A_FREEZE && | 489 def->t_action != A_FREEZE && |
| 490 !save(VS_MAGIC, def, -4)) { | 490 !save(VS_MAGIC, def, -4)) { |
| 491 turn_off(*att, CANDANCE); | 491 turn_off(*att, CANDANCE); |
| 492 turn_on(*def, ISDANCE); | 492 turn_on(*def, ISDANCE); |
| 493 msg("You begin to dance uncontrollably!"); | 493 msg("You begin to dance uncontrollably!"); |
| 494 fuse(undance, (VOID *)NULL, roll(2,4), AFTER); | 494 fuse(undance, NULL, roll(2,4), AFTER); |
| 495 } | 495 } |
| 496 | 496 |
| 497 /* | 497 /* |
| 498 * Suffocating our hero. Monsters don't get suffocated. | 498 * Suffocating our hero. Monsters don't get suffocated. |
| 499 * That's too hard for now. | 499 * That's too hard for now. |
| 502 !ISWEARING(R_FREEDOM) && | 502 !ISWEARING(R_FREEDOM) && |
| 503 rnd(100) < 30 && | 503 rnd(100) < 30 && |
| 504 (find_slot(suffocate) == 0)) { | 504 (find_slot(suffocate) == 0)) { |
| 505 turn_on(*att, DIDSUFFOCATE); | 505 turn_on(*att, DIDSUFFOCATE); |
| 506 msg("%s is beginning to suffocate you!", prname(attname, TRUE)); | 506 msg("%s is beginning to suffocate you!", prname(attname, TRUE)); |
| 507 fuse(suffocate, (VOID *)NULL, roll(9,3), AFTER); | 507 fuse(suffocate, NULL, roll(9,3), AFTER); |
| 508 } | 508 } |
| 509 | 509 |
| 510 /* | 510 /* |
| 511 * some creatures stops the poor guy from moving. | 511 * some creatures stops the poor guy from moving. |
| 512 * How can we do this to a monster? | 512 * How can we do this to a monster? |
| 550 int odor_str = -(rnd(6)+1); | 550 int odor_str = -(rnd(6)+1); |
| 551 | 551 |
| 552 msg("You are overcome by a foul odor!"); | 552 msg("You are overcome by a foul odor!"); |
| 553 if (lost_str == 0) { | 553 if (lost_str == 0) { |
| 554 chg_str(odor_str); | 554 chg_str(odor_str); |
| 555 fuse(res_strength, (VOID *)NULL, SMELLTIME, AFTER); | 555 fuse(res_strength, NULL, SMELLTIME, AFTER); |
| 556 lost_str -= odor_str; | 556 lost_str -= odor_str; |
| 557 } | 557 } |
| 558 else lengthen(res_strength, SMELLTIME); | 558 else lengthen(res_strength, SMELLTIME); |
| 559 } | 559 } |
| 560 } | 560 } |
