From 774c8a97448c79c7a4d3f9eb7d48e1c136f2bca3 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 3 Nov 2022 19:36:09 +0100
Subject: [PATCH] shmup:: Bulls now correctly destroy walls they crash into

---
 shmup.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/shmup.cpp b/shmup.cpp
index 164256d8..04e6d253 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -2433,8 +2433,14 @@ void moveMonster(monster *m, int delta) {
       }
     else {
       if(peace::on) { igo++; goto igo_retry; }
-      if(m->type == moRagingBull && m->stunoff == CHARGING)
+      if(m->type == moRagingBull && m->stunoff == CHARGING) {
+        auto old = m->base->monst;
+        m->base->monst = m->type;
+        beastcrash(c2, m->base);
+        if(m->base->monst != m->type) m->dead = true;
+        m->base->monst = old;
         m->stunoff = curtime + BULLSTUN;
+        }
       }
     }