final fusion fixes

3 files changed, 44 insertions, 10 deletions

diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 120dc1a..7861113 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -79,6 +79,8 @@ 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;
@@ -94,11 +96,27 @@ 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;
+			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;
+			}
 
 			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 2854c6c..68052a1 100644
--- a/src/simulation/elements/NBLE.cpp
+++ b/src/simulation/elements/NBLE.cpp
@@ -63,7 +63,12 @@ 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;
+            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;
+			}
 
             parts[i].temp = temp+1750+rand()%500;
             sim->pv[y/CELL][x/CELL] += 50;
@@ -73,4 +78,4 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
 }
 
 
-Element_NBLE::~Element_NBLE() {}
\ No newline at end of file
+Element_NBLE::~Element_NBLE() {}
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp
index e4eefdf..a39dcdf 100644
--- a/src/simulation/elements/O2.cpp
+++ b/src/simulation/elements/O2.cpp
@@ -69,6 +69,8 @@ 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;
@@ -83,9 +85,18 @@ 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;
+			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;
+			}
 
 			parts[i].temp = 15000;
 			sim->pv[y/CELL][x/CELL] += 300;