From fc7f872d8b39667e96e8bd825fe7908755c869fc Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Wed, 21 Dec 2011 20:23:27 +0000
Subject: [PATCH] Fix issue where heat transition would turn TNT to fire, TNT
 uses tmp for trigger state while Fire uses it for water vapourness.

---
 src/elementdata.c   |  2 +-
 src/elements/bang.c | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/elementdata.c b/src/elementdata.c
index d3cad8ce6..8f3e7535b 100644
--- a/src/elementdata.c
+++ b/src/elementdata.c
@@ -323,7 +323,7 @@ part_transition ptransitions[PT_NUM] =
 	/* ELEC */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/* ACEL */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/* DCEL */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
-	/* TNT  */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			673.0f,	PT_FIRE},
+	/* TNT  */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/* IGNP */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			673.0f,	PT_FIRE},
 	/* BOYL */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/*FREE*//* GOL  */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
diff --git a/src/elements/bang.c b/src/elements/bang.c
index a35e0fd9f..2c5c90408 100644
--- a/src/elements/bang.c
+++ b/src/elements/bang.c
@@ -4,22 +4,25 @@ int update_BANG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;
 	if(parts[i].tmp==0)
 	{
-		for (rx=-1; rx<2; rx++)
-			for (ry=-1; ry<2; ry++)
-				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
-				{
-					r = pmap[y+ry][x+rx];
-					if (!r)
-						continue;
-					if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
+		if(parts[i].temp>=673.0f)
+			parts[i].tmp = 1;
+		else
+			for (rx=-1; rx<2; rx++)
+				for (ry=-1; ry<2; ry++)
+					if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
 					{
-						parts[i].tmp = 1;
+						r = pmap[y+ry][x+rx];
+						if (!r)
+							continue;
+						if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
+						{
+							parts[i].tmp = 1;
+						}
+						else if ((r&0xFF)==PT_SPRK || (r&0xFF)==PT_LIGH)
+						{
+							parts[i].tmp = 1;
+						}
 					}
-					else if ((r&0xFF)==PT_SPRK || (r&0xFF)==PT_LIGH)
-					{
-						parts[i].tmp = 1;
-					}
-				}
 	
 	}
 	else if(parts[i].tmp==1)
@@ -36,6 +39,7 @@ int update_BANG(UPDATE_FUNC_ARGS) {
 		float otemp = parts[i].temp-275.13f;
 		//Explode!!
 		pv[y/CELL][x/CELL] += 0.5f;
+		parts[i].tmp = 0;
 		if(!(rand()%3))
 		{
 			if(!(rand()%2))