Fix monster trapped state being wrong

When cloning a monster, clear the clone trapped and hiding states.
When splitting a monster (eg. a black pudding), the clone could
be placed on a trap, so do mintrap.
When removing a monster from the map, clear the trapped state.

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index ec12a701fc5065b81deb33e896555c3f747bff4e..7b791a6b7936e847ab1507355fc34d3545165052 100644 (file)
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -422,6 +422,8 @@ Vlad wasn't set up as a vampshifter properly
 poly'd hero capable of spitting venom would leave intact venom object if it
        reached end of range at a 'soft' location such as water
 avoid impossible if monster cannot be relocated from teleport region
+fix cloned monster trapped and hiding states
+split monster could be placed on trap without triggering it
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository

diff --git a/src/makemon.c b/src/makemon.c
index 6b750f2f6cac6b043e7ce8c508a6e531df3e0477..94ee223dd7d58b498d0090e39188d594c225d9d4 100644 (file)
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -842,6 +842,8 @@ xchar x, y; /* clone's preferred location or 0 (near mon) */
     m2->mx = mm.x;
     m2->my = mm.y;
 
+    m2->mundetected = 0;
+    m2->mtrapped = 0;
     m2->mcloned = 1;
     m2->minvent = (struct obj *) 0; /* objects don't clone */
     m2->mleashed = FALSE;

diff --git a/src/mhitm.c b/src/mhitm.c
index a2d0c665990851287847b64b40b84eb1ae82cc1c..79f1e6739b98ccbefe7ec952c6bb020d3a6d8872 100644 (file)
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -419,7 +419,8 @@ register struct monst *magr, *mdef;
                                  || objects[otmp->otyp].oc_material == METAL))
                     && mdef->mhp > 1
                     && !mdef->mcan) {
-                    if (clone_mon(mdef, 0, 0)) {
+                    struct monst *mclone;
+                    if ((mclone = clone_mon(mdef, 0, 0)) != 0) {
                         if (vis && canspotmon(mdef)) {
                             char buf[BUFSZ];
 
@@ -427,6 +428,7 @@ register struct monst *magr, *mdef;
                             pline("%s divides as %s hits it!", buf,
                                   mon_nam(magr));
                         }
+                        mintrap(mclone);
                     }
                 }
             } else

diff --git a/src/mon.c b/src/mon.c
index 2882a226c006e742acb7b1fec39864e93b90acb2..7bb0d0f9886e2a76f15a4267368012a4534b4040 100644 (file)
--- a/src/mon.c
+++ b/src/mon.c
@@ -1687,6 +1687,7 @@ struct monst **monst_list; /* &migrating_mons or &mydogs or null */
     }
 
     if (on_map) {
+        mon->mtrapped = 0;
         if (mon->wormno)
             remove_worm(mon);
         else

diff --git a/src/uhitm.c b/src/uhitm.c
index b354d5d7a1feafad69970b865f9481c1f3539636..f478d028916f159b9ddc2915f978b78eae2f1b9e 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1227,7 +1227,8 @@ int dieroll;
             /* but not bashing with darts, arrows or ya */
             && !(is_ammo(obj) || is_missile(obj)))
         && hand_to_hand) {
-        if (clone_mon(mon, 0, 0)) {
+        struct monst *mclone;
+        if ((mclone = clone_mon(mon, 0, 0)) != 0) {
             char withwhat[BUFSZ];
 
             withwhat[0] = '\0';
@@ -1235,6 +1236,7 @@ int dieroll;
                 Sprintf(withwhat, " with %s", yname(obj));
             pline("%s divides as you hit it%s!", Monnam(mon), withwhat);
             hittxt = TRUE;
+            mintrap(mclone);
         }
     }