diff --git a/doc/fixes34.4 b/doc/fixes34.4 index f0cea27da..07d2016c9 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -102,6 +102,8 @@ avoid giving away wand type for near misses while blind avoid excessive repetition of "monsters are aware of your presence" monster's aggravation spell now affects meditating monsters busy pet won't miss out upon ascension +fix various places that "finally finished" could be displayed after the hero + stopped doing something other than eating Platform- and/or Interface-Specific Fixes diff --git a/src/apply.c b/src/apply.c index 5f0e3301b..5beb35615 100644 --- a/src/apply.c +++ b/src/apply.c @@ -704,6 +704,7 @@ struct obj *obj; "Yow! The mirror stares back!" : "Yikes! You've frozen yourself!"); nomul(-rnd((MAXULEV+6) - u.ulevel)); + nomovemsg = 0; } else You("stiffen momentarily under your gaze."); } else if (youmonst.data->mlet == S_VAMPIRE) You("don't have a reflection."); diff --git a/src/dothrow.c b/src/dothrow.c index c35c82963..9a735236a 100644 --- a/src/dothrow.c +++ b/src/dothrow.c @@ -633,6 +633,7 @@ hurtle(dx, dy, range, verbose) if(!range || (!dx && !dy) || u.ustuck) return; /* paranoia */ nomul(-range); + nomovemsg = 0; if (verbose) You("%s in the opposite direction.", range > 1 ? "hurtle" : "float"); /* if we're in the midst of shooting multiple projectiles, stop */ diff --git a/src/eat.c b/src/eat.c index 212bc3591..278d5e661 100644 --- a/src/eat.c +++ b/src/eat.c @@ -2590,6 +2590,7 @@ vomit() /* A good idea from David Neves */ { make_sick(0L, (char *) 0, TRUE, SICK_VOMITABLE); nomul(-2); + nomovemsg = 0; } int diff --git a/src/mcastu.c b/src/mcastu.c index c5079059c..ddcbf72c2 100644 --- a/src/mcastu.c +++ b/src/mcastu.c @@ -606,6 +606,7 @@ int spellnum; if (Half_spell_damage) dmg = (dmg + 1) / 2; nomul(-dmg); } + nomovemsg = 0; dmg = 0; break; case CLC_CONFUSE_YOU: diff --git a/src/polyself.c b/src/polyself.c index b480f2e63..18432a356 100644 --- a/src/polyself.c +++ b/src/polyself.c @@ -1043,6 +1043,7 @@ dogaze() -d((int)mtmp->m_lev+1, (int)mtmp->data->mattk[0].damd) : -200); + nomovemsg = 0; return 1; } else You("stiffen momentarily under %s gaze.", diff --git a/src/pray.c b/src/pray.c index ac6cf255d..5c3d772bb 100644 --- a/src/pray.c +++ b/src/pray.c @@ -1207,6 +1207,7 @@ dosacrifice() dmon->mpeaceful = TRUE; You("are terrified, and unable to move."); nomul(-3); + nomovemsg = 0; } else pline_The("%s.", demonless_msg); } @@ -1737,6 +1738,7 @@ doturn() } } nomul(-5); + nomovemsg = 0; return(1); } diff --git a/src/sounds.c b/src/sounds.c index 23c763971..da555808b 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -619,6 +619,7 @@ register struct monst *mtmp; pline("%s rattles noisily.", Monnam(mtmp)); You("freeze for a moment."); nomul(-2); + nomovemsg = 0; break; case MS_LAUGH: { diff --git a/src/spell.c b/src/spell.c index 7d4e22efb..a0bb838d9 100644 --- a/src/spell.c +++ b/src/spell.c @@ -326,7 +326,8 @@ learn() (void) confused_book(context.spbook.book); context.spbook.book = 0; /* no longer studying */ context.spbook.o_id = 0; - nomul(context.spbook.delay); /* remaining delay is uninterrupted */ + nomul(context.spbook.delay); /* remaining delay is uninterrupted */ + nomovemsg = 0; context.spbook.delay = 0; return(0); } @@ -466,7 +467,8 @@ register struct obj *spellbook; if (too_hard) { boolean gone = cursed_book(spellbook); - nomul(context.spbook.delay); /* study time */ + nomul(context.spbook.delay); /* study time */ + nomovemsg = 0; context.spbook.delay = 0; if(gone || !rn2(3)) { if (!gone) pline_The("spellbook crumbles to dust!"); @@ -482,6 +484,7 @@ register struct obj *spellbook; spellbook->in_use = FALSE; } nomul(context.spbook.delay); + nomovemsg = 0; context.spbook.delay = 0; return(1); } diff --git a/src/steal.c b/src/steal.c index 361dac8b1..7043daad4 100644 --- a/src/steal.c +++ b/src/steal.c @@ -391,12 +391,12 @@ gotobj: named++; /* the following is to set multi for later on */ nomul(-armordelay); + nomovemsg = 0; remove_worn_item(otmp, TRUE); otmp->cursed = curssv; - if(multi < 0){ + if(multi < 0) { /* multi = 0; - nomovemsg = 0; afternmv = 0; */ stealoid = otmp->o_id; diff --git a/src/timeout.c b/src/timeout.c index 24434a78d..b712a03fa 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -44,6 +44,7 @@ stoned_dialogue() case 3: /* limbs turned to stone */ stop_occupation(); nomul(-3); /* can't move anymore */ + nomovemsg = 0; break; default: break; @@ -1239,6 +1240,7 @@ do_storms() if(!u.uinvulnerable) { stop_occupation(); nomul(-3); + nomovemsg = 0; } } else You_hear("a rumbling noise."); diff --git a/src/uhitm.c b/src/uhitm.c index bb1ca6c67..ac3405a3b 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -2317,6 +2317,7 @@ boolean wep_was_destroyed; You("are frozen by %s gaze!", s_suffix(mon_nam(mon))); nomul((ACURR(A_WIS) > 12 || rn2(4)) ? -tmp : -127); + nomovemsg = 0; } } else { pline("%s cannot defend itself.",