Mercurial > hg > early-roguelike

diff srogue/monsters.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 e7aab31362af
children 28e22fb35989
line wrap: on
line diff
--- a/srogue/monsters.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/srogue/monsters.c	Wed Apr 14 18:55:33 2021 -0400
@@ -102,7 +102,7 @@
 	tp->t_indx = type;
 	tp->t_pos = *cp;
 	tp->t_room = roomin(cp);
-	tp->t_oldch = mvwinch(cw, cp->y, cp->x);
+	tp->t_oldch = mvwinch(cw, cp->y, cp->x) & A_CHARTEXT;
 	tp->t_nomove = 0;
 	tp->t_nocmd = 0;
 	mvwaddch(mw, cp->y, cp->x, tp->t_type);
@@ -261,7 +261,7 @@
 	 * Hide invisible monsters
 	 */
 	if ((tp->t_flags & ISINVIS) && pl_off(CANSEE))
-		ch = mvinch(y, x);
+		ch = mvinch(y, x) & A_CHARTEXT;
 	/*
 	 * Let greedy ones guard gold
 	 */
@@ -284,7 +284,7 @@
 	reg struct linked_list *ip, *nip;
 	reg struct thing *mp;
 	struct monster *mm;
-	reg int i, ii, c;
+	reg int i, c;
 
 	if (levcount == 0) {
 		mpos = 0;