Mercurial > hg > early-roguelike

diff arogue5/sticks.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 56e748983fa8
children
line wrap: on
line diff
--- a/arogue5/sticks.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/sticks.c	Wed Apr 14 18:55:33 2021 -0400
@@ -154,7 +154,7 @@
 
 	    y = hero.y;
 	    x = hero.x;
-	    while (shoot_ok(winat(y, x))) {
+	    while (shoot_ok(CCHAR( winat(y, x) ))) {
 		y += delta.y;
 		x += delta.x;
 	    }
@@ -331,7 +331,7 @@
 	case WS_SLOW_M:
 	    y = hero.y;
 	    x = hero.x;
-	    while (shoot_ok(winat(y, x))) {
+	    while (shoot_ok(CCHAR( winat(y, x) ))) {
 		y += delta.y;
 		x += delta.x;
 	    }
@@ -453,7 +453,7 @@
 	    else {
 		y = hero.y;
 		x = hero.x;
-		while (shoot_ok(winat(y, x)))
+		while (shoot_ok(CCHAR( winat(y, x) )))
 		{
 		    y += delta.y;
 		    x += delta.x;
@@ -477,7 +477,7 @@
 	    else {
 		y = hero.y;
 		x = hero.x;
-		while (shoot_ok(winat(y, x)))
+		while (shoot_ok(CCHAR( winat(y, x) )))
 		{
 		    y += delta.y;
 		    x += delta.x;
@@ -497,7 +497,7 @@
 	    when WS_FEAR:
 		y = hero.y;
 		x = hero.x;
-		while (shoot_ok(winat(y, x)))
+		while (shoot_ok(CCHAR( winat(y, x) )))
 		{
 		    y += delta.y;
 		    x += delta.x;
@@ -530,7 +530,7 @@
 	when WS_MDEG:
 	    y = hero.y;
 	    x = hero.x;
-	    while (shoot_ok(winat(y, x)))
+	    while (shoot_ok(CCHAR( winat(y, x) )))
 	    {
 		y += delta.y;
 		x += delta.x;
@@ -558,7 +558,7 @@
 	when WS_DISINTEGRATE:
 	    y = hero.y;
 	    x = hero.x;
-	    while (shoot_ok(winat(y, x))) {
+	    while (shoot_ok(CCHAR( winat(y, x) ))) {
 		y += delta.y;
 		x += delta.x;
 	    }