Mercurial > hg > early-roguelike

comparison xrogue/monsters.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 7c1cb43f346e
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
683 if (!save(VS_MAGIC, &player, 0)) { 683 if (!save(VS_MAGIC, &player, 0)) {
684 if (off(player, ISCLEAR)) { 684 if (off(player, ISCLEAR)) {
685 if (find_slot(unconfuse)) 685 if (find_slot(unconfuse))
686 lengthen(unconfuse, HUHDURATION); 686 lengthen(unconfuse, HUHDURATION);
687 else { 687 else {
688 fuse(unconfuse, (VOID *)NULL, HUHDURATION, AFTER); 688 fuse(unconfuse, NULL, HUHDURATION, AFTER);
689 msg("%s's gaze has confused you.",prname(mname, TRUE)); 689 msg("%s's gaze has confused you.",prname(mname, TRUE));
690 turn_on(player, ISHUH); 690 turn_on(player, ISHUH);
691 } 691 }
692 } 692 }
693 else msg("You feel dizzy for a moment, but it quickly passes."); 693 else msg("You feel dizzy for a moment, but it quickly passes.");
725 if(on(*tp, CANBLIND) && !find_slot(sight)) { 725 if(on(*tp, CANBLIND) && !find_slot(sight)) {
726 turn_off(*tp, CANBLIND); 726 turn_off(*tp, CANBLIND);
727 if (!save(VS_WAND, &player, 0)) { 727 if (!save(VS_WAND, &player, 0)) {
728 msg("The gaze of %s blinds you! ", prname(mname, FALSE)); 728 msg("The gaze of %s blinds you! ", prname(mname, FALSE));
729 turn_on(player, ISBLIND); 729 turn_on(player, ISBLIND);
730 fuse(sight, (VOID *)NULL, rnd(30)+20, AFTER); 730 fuse(sight, NULL, rnd(30)+20, AFTER);
731 light(&hero); 731 light(&hero);
732 } 732 }
733 } 733 }
734 734
735 /* the sight of the ghost can age you! */ 735 /* the sight of the ghost can age you! */