summaryrefslogtreecommitdiff
path: root/src/elements/shld.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/elements/shld.c')
-rw-r--r--src/elements/shld.c146
1 files changed, 77 insertions, 69 deletions
diff --git a/src/elements/shld.c b/src/elements/shld.c
index 940fa08..434a9db 100644
--- a/src/elements/shld.c
+++ b/src/elements/shld.c
@@ -1,33 +1,34 @@
#include <powder.h>
int update_SHLD1(UPDATE_FUNC_ARGS) {
- int r, nnx, nny;
- 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))
+ int r, nnx, nny, rx, ry;
+ 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 || !r)
continue;
- else if (parts[r>>8].type==PT_SPRK&&parts[i].life==0)
+ else if ((r&0xFF)==PT_SPRK&&parts[i].life==0)
+ {
+ if (55>rand()%200&&parts[i].life==0)
+ {
+ part_change_type(i,x,y,PT_SHLD2);
+ parts[i].life = 7;
+ }
for ( nnx=-1; nnx<2; nnx++)
for ( nny=-1; nny<2; nny++)
{
- if (7>rand()%200&&parts[i].life==0)
- {
- parts[i].type = PT_SHLD2;
- parts[i].life = 7;
- }
- else if (!pmap[y+ny+nny][x+nx+nnx])
+ if (!pmap[y+ry+nny][x+rx+nnx])
{
- create_part(-1,x+nx+nnx,y+ny+nny,PT_SHLD1);
+ create_part(-1,x+rx+nnx,y+ry+nny,PT_SHLD1);
//parts[pmap[y+ny+nny][x+nx+nnx]>>8].life=7;
}
}
- else if (parts[r>>8].type==PT_SHLD3&&4>rand()%10)
+ }
+ else if ((r&0xFF)==PT_SHLD3&&4>rand()%10)
{
- parts[i].type=PT_SHLD2;
+ part_change_type(i,x,y,PT_SHLD2);
parts[i].life = 7;
}
}
@@ -35,37 +36,39 @@ int update_SHLD1(UPDATE_FUNC_ARGS) {
}
int update_SHLD2(UPDATE_FUNC_ARGS) {
- int r, nnx, nny;
- 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))
+ int r, nnx, nny, rx, ry, np;
+ 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 && parts[i].life>0)
- create_part(-1,x+nx,y+ny,PT_SHLD1);
+ create_part(-1,x+rx,y+ry,PT_SHLD1);
if (!r)
continue;
- else if (parts[r>>8].type==PT_SPRK&&parts[i].life==0)
+ else if ((r&0xFF)==PT_SPRK&&parts[i].life==0)
+ {
+ if (25>rand()%200&&parts[i].life==0)
+ {
+ part_change_type(i,x,y,PT_SHLD3);
+ parts[i].life = 7;
+ }
for ( nnx=-1; nnx<2; nnx++)
for ( nny=-1; nny<2; nny++)
{
- if (3>rand()%200&&parts[i].life==0)
+ if (!pmap[y+ry+nny][x+rx+nnx])
{
- parts[i].type = PT_SHLD3;
- parts[i].life = 7;
- }
- else if (!pmap[y+ny+nny][x+nx+nnx])
- {
- create_part(-1,x+nx+nnx,y+ny+nny,PT_SHLD1);
- parts[pmap[y+ny+nny][x+nx+nnx]>>8].life=7;
+ np = create_part(-1,x+rx+nnx,y+ry+nny,PT_SHLD1);
+ if (np<0) continue;
+ parts[np].life=7;
}
}
- else if (parts[r>>8].type==PT_SHLD4&&4>rand()%10)
+ }
+ else if ((r&0xFF)==PT_SHLD4&&4>rand()%10)
{
- parts[i].type=PT_SHLD3;
+ part_change_type(i,x,y,PT_SHLD3);
parts[i].life = 7;
}
}
@@ -73,86 +76,91 @@ int update_SHLD2(UPDATE_FUNC_ARGS) {
}
int update_SHLD3(UPDATE_FUNC_ARGS) {
- int r, nnx, nny;
- 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))
+ int r, nnx, nny, rx, ry, np;
+ 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)
{
if (1>rand()%2500)
{
- create_part(-1,x+nx,y+ny,PT_SHLD1);
- parts[pmap[y+ny][x+nx]>>8].life=7;
- parts[i].type = PT_SHLD2;
+ np = create_part(-1,x+rx,y+ry,PT_SHLD1);
+ if (np<0) continue;
+ parts[np].life=7;
+ part_change_type(i,x,y,PT_SHLD2);
}
else
continue;
}
- if (parts[r>>8].type==PT_SHLD1 && parts[i].life>3)
+ if ((r&0xFF)==PT_SHLD1 && parts[i].life>3)
{
- parts[r>>8].type = PT_SHLD2;
+ part_change_type(r>>8,x+rx,y+ry,PT_SHLD2);
parts[r>>8].life=7;
}
- else if (parts[r>>8].type==PT_SPRK&&parts[i].life==0)
+ else if ((r&0xFF)==PT_SPRK&&parts[i].life==0)
+ {
+ if (18>rand()%3000&&parts[i].life==0)
+ {
+ part_change_type(i,x,y,PT_SHLD4);
+ parts[i].life = 7;
+ }
for ( nnx=-1; nnx<2; nnx++)
for ( nny=-1; nny<2; nny++)
{
- if (2>rand()%3000&&parts[i].life==0)
- {
- parts[i].type = PT_SHLD4;
- parts[i].life = 7;
- }
- else if (!pmap[y+ny+nny][x+nx+nnx])
+
+ if (!pmap[y+ry+nny][x+rx+nnx])
{
- create_part(-1,x+nx+nnx,y+ny+nny,PT_SHLD1);
- parts[pmap[y+ny+nny][x+nx+nnx]>>8].life=7;
+ np = create_part(-1,x+rx+nnx,y+ry+nny,PT_SHLD1);
+ if (np<0) continue;
+ parts[np].life=7;
}
}
+ }
}
return 0;
}
int update_SHLD4(UPDATE_FUNC_ARGS) {
- int r, nnx, nny;
- 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))
+ int r, nnx, nny, rx, ry, np;
+ 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)
{
if (1>rand()%5500)
{
- create_part(-1,x+nx,y+ny,PT_SHLD1);
- parts[pmap[y+ny][x+nx]>>8].life=7;
- parts[i].type = PT_SHLD2;
+ np = create_part(-1,x+rx,y+ry,PT_SHLD1);
+ if (np<0) continue;
+ parts[np].life=7;
+ part_change_type(i,x,y,PT_SHLD2);
}
else
continue;
}
- if (parts[r>>8].type==PT_SHLD2 && parts[i].life>3)
+ if ((r&0xFF)==PT_SHLD2 && parts[i].life>3)
{
- parts[r>>8].type = PT_SHLD3;
+ part_change_type(r>>8,x+rx,y+ry,PT_SHLD3);
parts[r>>8].life = 7;
}
- else if (parts[r>>8].type==PT_SPRK&&parts[i].life==0)
+ else if ((r&0xFF)==PT_SPRK&&parts[i].life==0)
for ( nnx=-1; nnx<2; nnx++)
for ( nny=-1; nny<2; nny++)
{
- if (!pmap[y+ny+nny][x+nx+nnx])
+ if (!pmap[y+ry+nny][x+rx+nnx])
{
- create_part(-1,x+nx+nnx,y+ny+nny,PT_SHLD1);
- parts[pmap[y+ny+nny][x+nx+nnx]>>8].life=7;
+ np = create_part(-1,x+rx+nnx,y+ry+nny,PT_SHLD1);
+ if (np<0) continue;
+ parts[np].life=7;
}
}
}