From eabf0f649e945d8c40cef9d232b1095d3e0e0e20 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Fri, 9 Feb 2007 01:35:41 +0000 Subject: [PATCH] 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. --- doc/fixes34.4 | 1 + src/apply.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index 97a7376c6..4d5d019e2 100644 --- 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 5f705602a..e114a914a 100644 --- 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.");