Mercurial > hg > early-roguelike

comparison xrogue/io.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 f54901b9c39b
children
comparison
equal deleted inserted replaced
303:e06ebc407615 304:e52a8a7ad4c5
165 register struct linked_list *item; 165 register struct linked_list *item;
166 register struct thing *tp; 166 register struct thing *tp;
167 unsigned char ch; 167 unsigned char ch;
168 168
169 /* What is here? Don't check monster window if MONSTOK is set */ 169 /* What is here? Don't check monster window if MONSTOK is set */
170 if (can_on_monst == MONSTOK) ch = mvinch(y, x); 170 if (can_on_monst == MONSTOK) ch = mvinch(y, x) & A_CHARTEXT;
171 else ch = winat(y, x); 171 else ch = winat(y, x) & A_CHARTEXT;
172 172
173 if (can_on_monst == FIGHTOK && isalpha(ch) && 173 if (can_on_monst == FIGHTOK && isalpha(ch) &&
174 (item = find_mons(y, x)) != NULL) { 174 (item = find_mons(y, x)) != NULL) {
175 tp = THINGPTR(item); /* What monster is here? */ 175 tp = THINGPTR(item); /* What monster is here? */
176 176