Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

2 files changed, 40 insertions, 1 deletions

diff --git a/src/elements/O2.c b/src/elements/O2.c
index 1413d0a..4c019d3 100644
--- a/src/elements/O2.c
+++ b/src/elements/O2.c
@@ -2,7 +2,7 @@
 
 int update_O2(UPDATE_FUNC_ARGS)
 {
-    int r,rx,ry;
+    int r,rx,ry,n,nx,ny;
     for(rx=-2; rx<3; rx++)
         for(ry=-2; ry<3; ry++)
 			if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@@ -17,7 +17,26 @@ int update_O2(UPDATE_FUNC_ARGS)
                     parts[r>>8].temp+=(rand()/(RAND_MAX/100));
                     parts[i].tmp++;
                 }
+
             }
+
+    if(pv[y\CELL][x\CELL] > 8.0f)
+    {
+        for(rx=-2; rx<3; rx++)
+            for(ry=-2; ry<3; ry++)
+			    if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
+			    {
+				    r = pmap[y+ry][x+rx];
+				    if ((r>>8)>=NPART || !r)
+					    continue;
+                    if((r&0xFF)==PT_H2)
+                        if(50<(rand()/(RAND_MAX/100)))
+                            part_change_type(i,x,y,PT_WATR)
+                        part_change_type(r,rx,rx,PT_WATR)
+                }
+    }
+
+
     if(parts[i].tmp>=50)
     {
         create_part(i,x,y,PT_FIRE);
diff --git a/src/elements/h2.c b/src/elements/h2.c
new file mode 100644
index 0000000..8e83ecd
--- /dev/null
+++ b/src/elements/h2.c
@@ -0,0 +1,20 @@
+#include <element.h>
+
+int update_H2(UPDATE_FUNC_ARGS)
+{
+    int r,rx,ry,rt;
+    for(rx=-2; rx<3; rx++)
+        for(ry=-2; ry<3; ry++)
+			if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
+			{
+				r = pmap[y+ry][x+rx];
+                rt = (r&0xFF);
+				if ((r>>8)>=NPART || !r)
+					continue;
+                if(pv[y\CELL][x\CELL] > 8.0f && rt == PT_DESL)
+                {
+                    part_change_type(r,nx,ny,PT_WATR)
+                    part_change_type(i,x,y,PT_OIL)
+                }
+            }
+}