Merge pull request #66 from jacob1/Modstuff

Code structure improvements for graphics/drawing, improvements to prevent accidental infinite loops in Lua, Fixes for fusion, improvements for VOID types. And other minor improvements

1 files changed, 3 insertions, 2 deletions

diff --git a/src/elements/co2.c b/src/elements/co2.c
index 77a92b0..acdbc99 100644
--- a/src/elements/co2.c
+++ b/src/elements/co2.c
@@ -49,12 +49,13 @@ int update_CO2(UPDATE_FUNC_ARGS) {
 			int j;
 			kill_part(i);
 			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000;
-			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000;
+			if (!(rand()%50)) { j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000; }
 			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_O2);  if (j != -1) parts[j].temp = 15000;
-			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = rand()%100+450; }
+			if (rand()%1000 < 1) { j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = 3; } }
 
 			parts[i].temp += 15000;
 			pv[y/CELL][x/CELL] += 100;
+			return 1;
 		}
 	}
 	return 0;