From 9b10f0c39042885a6969324959dcd1c680a9a4d9 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Sat, 25 Aug 2012 16:32:51 +0100
Subject: Revert "final fusion fixes"

This reverts commit add4226f316b2e7abd0b988ef27cb4a7ca143c31.

diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 7861113..120dc1a 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -79,8 +79,6 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
 					}
 					if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
 					{
-						if(parts[r>>8].tmp&8&&rt==PT_PLSM)
-							continue;
 						sim->create_part(i,x,y,PT_FIRE);
 						parts[i].temp+=(rand()%250);
 						parts[i].tmp |= 1;
@@ -96,27 +94,11 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
 			float temp = parts[i].temp;
 			sim->create_part(i,x,y,PT_NBLE);
 
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); 
-			if (j != -1) 
-				parts[j].temp = temp;
-			if (!(rand()%10)) 
-			{ 
-				j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); 
-				if (j != -1) 
-					parts[j].temp = temp; 
-			}
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); 
-			if (j != -1) 
-			{ 
-				parts[j].ctype = 0xFFFF00; 
-				parts[j].temp = temp; 
-			}
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); 
-			if (j != -1)
-			{
-				parts[j].temp = temp;
-				parts[j].tmp |=8;
-			}
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = temp;
+			if (!(rand()%10)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFFFF00; parts[j].temp = temp; }
+
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
 
 			parts[i].temp = temp+750+rand()%500;
 			sim->pv[y/CELL][x/CELL] += 30;
diff --git a/src/simulation/elements/NBLE.cpp b/src/simulation/elements/NBLE.cpp
index 68052a1..2854c6c 100644
--- a/src/simulation/elements/NBLE.cpp
+++ b/src/simulation/elements/NBLE.cpp
@@ -63,12 +63,7 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
             if (!(rand()%25)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
             j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFF0000; parts[j].temp = temp; }
 
-            j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); 
-			if (j != -1) 
-			{
-				parts[j].temp = temp;
-				parts[j].tmp |=8;
-			}
+            j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
 
             parts[i].temp = temp+1750+rand()%500;
             sim->pv[y/CELL][x/CELL] += 50;
@@ -78,4 +73,4 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
 }
 
 
-Element_NBLE::~Element_NBLE() {}
+Element_NBLE::~Element_NBLE() {}
\ No newline at end of file
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp
index a39dcdf..e4eefdf 100644
--- a/src/simulation/elements/O2.cpp
+++ b/src/simulation/elements/O2.cpp
@@ -69,8 +69,6 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
 					}
 					if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
 					{
-						if((r&0xFF)==PT_PLSM && parts[r>>8].tmp&8)
-							continue;
 						sim->create_part(i,x,y,PT_FIRE);
 						parts[i].temp+=(rand()/(RAND_MAX/100));
 						parts[i].tmp |= 2;
@@ -85,18 +83,9 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
 			int j;
 			sim->create_part(i,x,y,PT_BRMT);
 
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); 
-			if (j != -1) 
-				parts[j].temp = 15000;
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); 
-			if (j != -1) 
-				parts[j].temp = 15000;
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
-			if (j != -1)
-			{
-				parts[j].temp = 15000;
-				parts[j].tmp |= 8;
-			}
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000;
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) parts[j].temp = 15000;
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = 15000;
 
 			parts[i].temp = 15000;
 			sim->pv[y/CELL][x/CELL] += 300;
--
cgit v0.9.2-21-gd62e