Mercurial > hg > early-roguelike

comparison rogue3/pack.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 d9e44e18eeec
children
comparison
equal deleted inserted replaced
303:e06ebc407615 304:e52a8a7ad4c5
77 } 77 }
78 /* 78 /*
79 * Check for and deal with scare monster scrolls 79 * Check for and deal with scare monster scrolls
80 */ 80 */
81 if (obj->o_type == SCROLL && obj->o_which == S_SCARE) 81 if (obj->o_type == SCROLL && obj->o_which == S_SCARE)
82 {
82 if (obj->o_flags & ISFOUND) 83 if (obj->o_flags & ISFOUND)
83 { 84 {
84 msg("The scroll turns to dust as you pick it up."); 85 msg("The scroll turns to dust as you pick it up.");
85 detach(lvl_obj, item); 86 detach(lvl_obj, item);
86 mvaddch(hero.y, hero.x, FLOOR); 87 mvaddch(hero.y, hero.x, FLOOR);
87 return; 88 return;
88 } 89 }
89 else 90 else
90 obj->o_flags |= ISFOUND; 91 obj->o_flags |= ISFOUND;
92 }
91 93
92 inpack++; 94 inpack++;
93 if (from_floor) 95 if (from_floor)
94 { 96 {
95 detach(lvl_obj, item); 97 detach(lvl_obj, item);