From: nethack.allison <nethack.allison>
Date: Mon, 29 Sep 2003 02:20:18 +0000 (+0000)
Subject: U675 fix
X-Git-Tag: MOVE2GIT~1745
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6d32e499d6d49b92afeee88e92a6dacc85a86b0;p=nethack

U675 fix

if the monster that a statue represents is not made of flesh then don't
allow stone_to_flesh to animate it, make a meatball instead
---

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index 0909437e3..0871fee76 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -33,6 +33,8 @@ more tweaks to fog cloud behavior
 when dismounting by choice and unimpaired, try not to land on a boulder
 casting stone-to-flesh on self while wielding a statue caused problems
 add tab support to menu strings for control-x minimal_enlightenment()
+if the monster that a statue represents is not made of flesh then don't
+	allow stone_to_flesh to animate it, make a meatball instead
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/zap.c b/src/zap.c
index 8e6dc1591..587af1d12 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1599,6 +1599,11 @@ struct obj *obj, *otmp;
 
 			    (void) get_obj_location(obj, &oox, &ooy, 0);
 			    refresh_x = oox; refresh_y = ooy;
+			    if (vegetarian(&mons[obj->corpsenm])) {
+				/* Don't animate monsters that aren't flesh */
+				obj = poly_obj(obj, MEATBALL);
+			    	goto smell;
+			    }
 			    if (!animate_statue(obj, oox, ooy,
 						ANIMATE_SPELL, (int *)0)) {
 				struct obj *item;
@@ -1632,6 +1637,11 @@ makecorpse:			if (mons[obj->corpsenm].geno &
 			    res = 0;
 			    break;
 			}
+			if (vegetarian(&mons[obj->corpsenm])) {
+			    /* Don't animate monsters that aren't flesh */
+			    obj = poly_obj(obj, MEATBALL);
+			    goto smell;
+			}
 			(void) get_obj_location(obj, &oox, &ooy, 0);
 			refresh_x = oox; refresh_y = ooy;
 			mon = makemon(&mons[obj->corpsenm],