Mercurial > hg > early-roguelike

comparison xrogue/sticks.c @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents 2236ef808bcb
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
511 pstats.s_hpt /= 2; 511 pstats.s_hpt /= 2;
512 if (pstats.s_hpt <= 0) { 512 if (pstats.s_hpt <= 0) {
513 pstats.s_hpt = -1; 513 pstats.s_hpt = -1;
514 msg("Your life has been sucked out from you! --More--"); 514 msg("Your life has been sucked out from you! --More--");
515 wait_for(' '); 515 wait_for(' ');
516 death(zapper); 516 death(zapper->t_index);
517 } 517 }
518 else 518 else
519 msg("You feel a great drain on your system."); 519 msg("You feel a great drain on your system.");
520 } 520 }
521 if (tp == NULL) 521 if (tp == NULL)
611 } 611 }
612 if (!save(VS_WAND, &player, 0) && !ISWEARING(R_HEALTH)) { 612 if (!save(VS_WAND, &player, 0) && !ISWEARING(R_HEALTH)) {
613 turn_on(player, HASDISEASE); 613 turn_on(player, HASDISEASE);
614 turn_on(player, HASINFEST); 614 turn_on(player, HASINFEST);
615 turn_on(player, DOROT); 615 turn_on(player, DOROT);
616 fuse(cure_disease, (VOID *)NULL, roll(HEALTIME,SICKTIME), AFTER); 616 fuse(cure_disease, NULL, roll(HEALTIME,SICKTIME), AFTER);
617 infest_dam++; 617 infest_dam++;
618 } 618 }
619 else if (sick == FALSE) msg("You feel momentarily sick"); 619 else if (sick == FALSE) msg("You feel momentarily sick");
620 } 620 }
621 else { 621 else {