reduce rand() chances to 5x the old values in elements that were changed to 3x3 loop checks instead of 5x5. Also some other fixes I found when looking at what had been changed.

1 files changed, 11 insertions, 8 deletions

diff --git a/src/simulation/elements/COAL.cpp b/src/simulation/elements/COAL.cpp
index 3186167..b2cc89c 100644
--- a/src/simulation/elements/COAL.cpp
+++ b/src/simulation/elements/COAL.cpp
@@ -49,7 +49,7 @@ Element_COAL::Element_COAL()
 //#TPT-Directive ElementHeader Element_COAL static int update(UPDATE_FUNC_ARGS)
 int Element_COAL::update(UPDATE_FUNC_ARGS)
  {
-	int r, rx, ry, trade, temp;
+	int r, rx, ry, trade, temp, t = parts[i].type;
 	if (parts[i].life<=0) {
 		sim->create_part(i, x, y, PT_FIRE);
 		return 1;
@@ -57,13 +57,16 @@ int Element_COAL::update(UPDATE_FUNC_ARGS)
 		parts[i].life--;
 		sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_FIRE);
 	}
-	if ((sim->pv[y/CELL][x/CELL] > 4.3f)&&parts[i].tmp>40)
-		parts[i].tmp=39;
-	else if (parts[i].tmp<40&&parts[i].tmp>0)
-		parts[i].tmp--;
-	else if (parts[i].tmp<=0) {
-		sim->create_part(i, x, y, PT_BCOL);
-		return 1;
+	if (t == PT_COAL)
+	{
+		if ((sim->pv[y/CELL][x/CELL] > 4.3f)&&parts[i].tmp>40)
+			parts[i].tmp=39;
+		else if (parts[i].tmp<40&&parts[i].tmp>0)
+			parts[i].tmp--;
+		else if (parts[i].tmp<=0) {
+			sim->create_part(i, x, y, PT_BCOL);
+			return 1;
+		}
 	}
 	/*if(100-parts[i].life > parts[i].tmp2)
 		parts[i].tmp2 = 100-parts[i].life;