Mercurial > hg > early-roguelike

comparison arogue5/util.c @ 304:e52a8a7ad4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.
author John "Elwin" Edwards
date Wed, 14 Apr 2021 18:55:33 -0400
parents d71e5e1f49cf
children
comparison
equal deleted inserted replaced
303:e06ebc407615 304:e52a8a7ad4c5
622 * Don't show room walls if he is in a passage and 622 * Don't show room walls if he is in a passage and
623 * check for maze turns 623 * check for maze turns
624 */ 624 */
625 if (off(player, ISBLIND)) 625 if (off(player, ISBLIND))
626 { 626 {
627 if (y == hero.y && x == hero.x 627 if ((y == hero.y && x == hero.x)
628 || (inpass && (ch == '-' || ch == '|'))) 628 || (inpass && (ch == '-' || ch == '|')))
629 continue; 629 continue;
630 630
631 /* Did we come to a crossroads in a maze? */ 631 /* Did we come to a crossroads in a maze? */
632 if (levtype == MAZELEV && 632 if (levtype == MAZELEV &&
823 cp.y = y; 823 cp.y = y;
824 cp.x = x; 824 cp.x = x;
825 cpp = &cp; 825 cpp = &cp;
826 for (rp = rooms, i = 0; i < MAXROOMS; rp++, i++) 826 for (rp = rooms, i = 0; i < MAXROOMS; rp++, i++)
827 if (inroom(rp, cpp)) 827 if (inroom(rp, cpp))
828 {
828 if (y == rp->r_pos.y || y == rp->r_pos.y + rp->r_max.y - 1) 829 if (y == rp->r_pos.y || y == rp->r_pos.y + rp->r_max.y - 1)
829 return('-'); 830 return('-');
830 else 831 else
831 return('|'); 832 return('|');
833 }
832 834
833 return('p'); 835 return('p');
834 } 836 }
835 837
836 /* 838 /*