From bf732ff89f7732f5f47ed9d9740d8044c533289b Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 6 Feb 2019 22:12:58 +0100
Subject: [PATCH] fixed a bug with pushing thumpers into fire traps.

---
 game.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/game.cpp b/game.cpp
index b5ea93a7..64f65d72 100644
--- a/game.cpp
+++ b/game.cpp
@@ -7549,13 +7549,17 @@ void monstersTurn() {
 
 void pushThumper(cell *th, cell *cto) {
   eWall w = th->wall;
-  cto->wparam = th->wparam;
   if(th->land == laAlchemist)
     th->wall = isAlch(cwt.at) ? cwt.at->wall : cto->wall;
   else th->wall = waNone;
   int explode = 0;
   if(cto->wall == waArrowTrap && w == waExplosiveBarrel ) explode = max<int>(cto->wparam, 1);
-  if(cto->wall == waFireTrap) explode = max<int>(cto->wparam, 1);
+  if(cto->wall == waFireTrap) {
+    if(w == waExplosiveBarrel)
+      explode = max<int>(cto->wparam, 1);
+    if(w == waThumperOn)
+      explode = 2;
+    }
   destroyTrapsOn(cto);
   if(cto->wall == waOpenPlate || cto->wall == waClosePlate) {
     toggleGates(cto, cto->wall);
@@ -7578,6 +7582,8 @@ void pushThumper(cell *th, cell *cto) {
   else 
     cto->wall = w;
   if(explode) cto->wall = waFireTrap, cto->wparam = explode;
+  if(cto->wall == waThumperOn)
+    cto->wparam = th->wparam;
   }
 
 bool canPushThumperOn(cell *tgt, cell *thumper, cell *player) {