More update functions cleanup.

1 files changed, 20 insertions, 22 deletions

diff --git a/src/elements/plnt.c b/src/elements/plnt.c
index 695e1b8..dc5f07c 100644
--- a/src/elements/plnt.c
+++ b/src/elements/plnt.c
@@ -1,42 +1,41 @@
 #include <powder.h>
 
 int update_PLNT(UPDATE_FUNC_ARGS) {
-	int r;
-	for (nx=-2; nx<3; nx++)
-		for (ny=-2; ny<3; ny++)
-			if (x+nx>=0 && y+ny>0 &&
-			        x+nx<XRES && y+ny<YRES && (nx || ny))
+	int r, rx, ry, np;
+	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+ny][x+nx];
+				r = pmap[y+ry][x+rx];
 				if ((r>>8)>=NPART || !r)
 					continue;
 				if ((r&0xFF)==PT_WATR && 1>(rand()%250))
 				{
-					parts[i].type = PT_PLNT;
-					parts[r>>8].type = PT_PLNT;
-					parts[r>>8].life = 0;
+					np = create_part(r>>8,x+rx,y+ry,PT_PLNT);
+					if (np<0) continue;
+					parts[np].life = 0;
 				}
 				else if ((r&0xFF)==PT_LAVA && 1>(rand()%250))
 				{
+					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
-					parts[i].type = PT_FIRE;
 				}
 				else if ((r&0xFF)==PT_SMKE && (1>rand()%250))
 				{
-					parts[r>>8].type = PT_NONE;
+					kill_part(r>>8);
 					parts[i].life = rand()%60 + 60;
 				}
 				else if ((r&0xFF)==PT_WOOD && (1>rand()%20) && abs(nx+ny)<=2 && VINE_MODE)
 				{
 					int nnx = rand()%3 -1;
 					int nny = rand()%3 -1;
-					if (x+nx+nnx>=0 && y+ny+nny>0 &&
-					        x+nx+nnx<XRES && y+ny+nny<YRES && (nnx || nny))
+					if (x+rx+nnx>=0 && y+ry+nny>0 && x+rx+nnx<XRES && y+ry+nny<YRES && (nnx || nny))
 					{
-						if ((pmap[y+ny+nny][x+nx+nnx]>>8)>=NPART||pmap[y+ny+nny][x+nx+nnx])
+						if ((pmap[y+ry+nny][x+rx+nnx]>>8)>=NPART||pmap[y+ry+nny][x+rx+nnx])
 							continue;
-						if (create_part(-1,x+nx+nnx,y+ny+nny,PT_VINE))
-							parts[pmap[y+ny+nny][x+nx+nnx]>>8].temp = parts[i].temp;
+						np = create_part(-1,x+rx+nnx,y+ry+nny,PT_VINE);
+						if (np<0) continue;
+						parts[np].temp = parts[i].temp;
 					}
 				}
 				//if(t==PT_SNOW && (r&0xFF)==PT_WATR && 15>(rand()%1000))
@@ -44,16 +43,15 @@ int update_PLNT(UPDATE_FUNC_ARGS) {
 			}
 	if (parts[i].life==2)
 	{
-		for (nx=-1; nx<2; nx++)
-			for (ny=-1; ny<2; ny++)
-				if (x+nx>=0 && y+ny>0 &&
-				        x+nx<XRES && y+ny<YRES && (nx || ny))
+		for (rx=-1; rx<2; rx++)
+			for (ry=-1; ry<2; ry++)
+				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
 				{
-					r = pmap[y+ny][x+nx];
+					r = pmap[y+ry][x+rx];
 					if ((r>>8)>=NPART)
 						continue;
 					if (!r)
-						create_part(-1,x+nx,y+ny,PT_O2);
+						create_part(-1,x+rx,y+ry,PT_O2);
 				}
 		parts[i].life = 0;
 	}