Mercurial > hg > early-roguelike

comparison arogue7/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 e1cd27c5464f
children 28e22fb35989
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
647 if (!save(VS_MAGIC, &player, 0)) { 647 if (!save(VS_MAGIC, &player, 0)) {
648 if (off(player, ISCLEAR)) { 648 if (off(player, ISCLEAR)) {
649 if (find_slot(unconfuse)) 649 if (find_slot(unconfuse))
650 lengthen(unconfuse, HUHDURATION); 650 lengthen(unconfuse, HUHDURATION);
651 else { 651 else {
652 fuse(unconfuse, 0, HUHDURATION, AFTER); 652 fuse(unconfuse, NULL, HUHDURATION, AFTER);
653 msg("%s's gaze has confused you.",prname(mname, TRUE)); 653 msg("%s's gaze has confused you.",prname(mname, TRUE));
654 turn_on(player, ISHUH); 654 turn_on(player, ISHUH);
655 } 655 }
656 } 656 }
657 else msg("You feel dizzy for a moment, but it quickly passes."); 657 else msg("You feel dizzy for a moment, but it quickly passes.");
689 if(on(*tp, CANBLIND) && !find_slot(sight)) { 689 if(on(*tp, CANBLIND) && !find_slot(sight)) {
690 turn_off(*tp, CANBLIND); 690 turn_off(*tp, CANBLIND);
691 if (!save(VS_WAND, &player, 0)) { 691 if (!save(VS_WAND, &player, 0)) {
692 msg("The gaze of %s blinds you", prname(mname, FALSE)); 692 msg("The gaze of %s blinds you", prname(mname, FALSE));
693 turn_on(player, ISBLIND); 693 turn_on(player, ISBLIND);
694 fuse(sight, 0, rnd(30)+20, AFTER); 694 fuse(sight, NULL, rnd(30)+20, AFTER);
695 light(&hero); 695 light(&hero);
696 } 696 }
697 } 697 }
698 698
699 /* the sight of the ghost can age you! */ 699 /* the sight of the ghost can age you! */