fix #Q367 - tinning Rider corpse when level is full

     From a bug report:  if you try to tin a
Rider's corpse and revival fails, you still get the gimicky message about
War not preserving his enemies.  Give the suggested alternate message in
that case:  The corpse evades your grasp.  I hope that we can do better
than that, but I'm too burned out to think of anything.

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 97a7376c63a9e08b07ee43513511541d25b79f46..4d5d019e26f956b7aabc98fe2d4ecc177b246fd3 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -312,6 +312,7 @@ fireproof, non-rustable weapon would be revealed as fireproof by hitting a
 surviving choking while eating various foods (cockatrice egg, fortune cookie,
        wolfsbane, others) didn't carry through to those foods' side-effects
 shapechangers who take on mimic or hider form will mimic or hide when feasible
+avoid War message if tinning a Rider corpse fails
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/apply.c b/src/apply.c
index 5f705602a36c174a1ef5f94b7b09de24cb151c50..e114a914a7a32bb335a53fa0d18d6d00e226104c 100644 (file)
--- a/src/apply.c
+++ b/src/apply.c
@@ -1522,9 +1522,11 @@ register struct obj *obj;
            instapetrify(kbuf);
        }
        if (is_rider(&mons[corpse->corpsenm])) {
-               (void) revive_corpse(corpse);
+           if (revive_corpse(corpse))
                verbalize("Yes...  But War does not preserve its enemies...");
-               return;
+           else
+               pline_The("corpse evades your grasp.");
+           return;
        }
        if (mons[corpse->corpsenm].cnutrit == 0) {
                pline("That's too insubstantial to tin.");