Mercurial > hg > early-roguelike

comparison arogue7/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 e1cd27c5464f
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
588 } 588 }
589 if (!save(VS_WAND, &player, 0) && !ISWEARING(R_HEALTH)) { 589 if (!save(VS_WAND, &player, 0) && !ISWEARING(R_HEALTH)) {
590 turn_on(player, HASDISEASE); 590 turn_on(player, HASDISEASE);
591 turn_on(player, HASINFEST); 591 turn_on(player, HASINFEST);
592 turn_on(player, DOROT); 592 turn_on(player, DOROT);
593 fuse(cure_disease, 0, roll(HEALTIME,SICKTIME), AFTER); 593 fuse(cure_disease, NULL, roll(HEALTIME,SICKTIME), AFTER);
594 infest_dam++; 594 infest_dam++;
595 } 595 }
596 else msg("You fell momentarily sick"); 596 else msg("You fell momentarily sick");
597 } 597 }
598 else { 598 else {
1186 if (on(player, ISHUH)) 1186 if (on(player, ISHUH))
1187 lengthen(unconfuse, 1187 lengthen(unconfuse,
1188 rnd(20)+HUHDURATION); 1188 rnd(20)+HUHDURATION);
1189 else { 1189 else {
1190 turn_on(player, ISHUH); 1190 turn_on(player, ISHUH);
1191 fuse(unconfuse, 0, 1191 fuse(unconfuse, NULL,
1192 rnd(20)+HUHDURATION, AFTER); 1192 rnd(20)+HUHDURATION, AFTER);
1193 msg( 1193 msg(
1194 "The confusion gas has confused you."); 1194 "The confusion gas has confused you.");
1195 } 1195 }
1196 } 1196 }