summaryrefslogtreecommitdiff
path: root/src/elements/prto.c
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-04-25 17:05:35 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-04-25 18:00:27 (GMT)
commit24f59050204017c641749c59a69e40d53074c028 (patch)
tree230f97023a3d8afb21f91e853db28c239b89c59a /src/elements/prto.c
parent4c153d2f34b0228e398ef3d1d935004dba6a9318 (diff)
downloadpowder-24f59050204017c641749c59a69e40d53074c028.zip
powder-24f59050204017c641749c59a69e40d53074c028.tar.gz
portal now uses particles as storage, so it keeps everything.
Diffstat (limited to 'src/elements/prto.c')
-rw-r--r--src/elements/prto.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/elements/prto.c b/src/elements/prto.c
index 46c7250..4b6a576 100644
--- a/src/elements/prto.c
+++ b/src/elements/prto.c
@@ -34,29 +34,27 @@ int update_PRTO(UPDATE_FUNC_ARGS) {
randomness=1;
if (randomness>8)
randomness=8;
- if (portal[parts[i].tmp][randomness-1][nnx]==PT_SPRK)// TODO: make it look better, spark creation
+ if (portalp[parts[i].tmp][randomness-1][nnx].type==PT_SPRK)// TODO: make it look better, spark creation
{
- create_part(-1,x+1,y,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x+1,y+1,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x+1,y-1,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x,y-1,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x,y+1,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x-1,y+1,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x-1,y,portal[parts[i].tmp][randomness-1][nnx]);
- create_part(-1,x-1,y-1,portal[parts[i].tmp][randomness-1][nnx]);
- portal[parts[i].tmp][randomness-1][nnx] = 0;
- portaltemp[parts[i].tmp][randomness-1][nnx] = 0;
+ create_part(-1,x+1,y,PT_SPRK);
+ create_part(-1,x+1,y+1,PT_SPRK);
+ create_part(-1,x+1,y-1,PT_SPRK);
+ create_part(-1,x,y-1,PT_SPRK);
+ create_part(-1,x,y+1,PT_SPRK);
+ create_part(-1,x-1,y+1,PT_SPRK);
+ create_part(-1,x-1,y,PT_SPRK);
+ create_part(-1,x-1,y-1,PT_SPRK);
+ portalp[parts[i].tmp][randomness-1][nnx] = emptyparticle;
break;
}
- else if (portal[parts[i].tmp][randomness-1][nnx])
+ else if (portalp[parts[i].tmp][randomness-1][nnx].type)
{
- np = create_part(-1,x+rx,y+ry,portal[parts[i].tmp][randomness-1][nnx]);
+ np = create_part(-1,x+rx,y+ry,portalp[parts[i].tmp][randomness-1][nnx].type);
if (np<0) continue;
- parts[np].temp = portaltemp[parts[i].tmp][randomness-1][nnx];
- parts[np].ctype = portalctype[parts[i].tmp][randomness-1][nnx];
- portal[parts[i].tmp][randomness-1][nnx] = 0;
- portaltemp[parts[i].tmp][randomness-1][nnx] = 0;
- portalctype[parts[i].tmp][randomness-1][nnx] = 0;
+ parts[np] = portalp[parts[i].tmp][randomness-1][nnx];
+ parts[np].x = x+rx;
+ parts[np].y = y+ry;
+ portalp[parts[i].tmp][randomness-1][nnx] = emptyparticle;
break;
}
}