Mercurial > hg > early-roguelike

diff arogue7/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
line wrap: on
line diff
--- a/arogue7/util.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue7/util.c	Wed Apr 14 18:55:33 2021 -0400
@@ -583,7 +583,7 @@
     else if (on(player, ISFLEE)) {
 	    y = hero.y;
 	    x = hero.x;
-	    while (shoot_ok(winat(y, x))) {
+	    while (shoot_ok(CCHAR( winat(y, x) ))) {
 		y += direction->y;
 		x += direction->x;
 	    }
@@ -821,7 +821,7 @@
 	     */
 	    if (off(player, ISBLIND))
 	    {
-		if (y == hero.y && x == hero.x
+		if ((y == hero.y && x == hero.x)
 		    || (inpass && (ch == '-' || ch == '|')))
 			continue;
 
@@ -1150,10 +1150,12 @@
     cpp = &cp;
     for (rp = rooms, i = 0; i < MAXROOMS; rp++, i++)
 	if (inroom(rp, cpp))
+	{
 	    if (y == rp->r_pos.y || y == rp->r_pos.y + rp->r_max.y - 1)
 		return('-');
 	    else
 		return('|');
+	}
 
     return('p');
 }