summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-08 20:33:54 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-08 20:33:54 (GMT)
commit0958a6e6da7ffd8c93779bfeb4552e18f593a090 (patch)
tree619953bcd661fe26e3ecbe53b2c82132900b459c /src
parentb4fb2bf20a807f4371a6848b3470baf2d5638ccb (diff)
downloadpowder-0958a6e6da7ffd8c93779bfeb4552e18f593a090.zip
powder-0958a6e6da7ffd8c93779bfeb4552e18f593a090.tar.gz
add ctype transfer to portal
Diffstat (limited to 'src')
-rw-r--r--src/powder.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/powder.c b/src/powder.c
index 303ed58..b999b36 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -3321,6 +3321,7 @@ void update_particles_i(pixel *vid, int start, int inc)
{
portal[parts[i].tmp][count-1][nnx] = parts[r>>8].type;
portaltemp[parts[i].tmp][count-1][nnx] = parts[r>>8].temp;
+ portalctype[parts[i].tmp][count-1][nnx] = parts[r>>8].ctype;
if(parts[r>>8].type==PT_SPRK)
parts[r>>8].type = parts[r>>8].ctype;
else
@@ -3372,8 +3373,10 @@ void update_particles_i(pixel *vid, int start, int inc)
{
create_part(-1,x+nx,y+ny,portal[parts[i].tmp][randomness-1][nnx]);
parts[pmap[y+ny][x+nx]>>8].temp = portaltemp[parts[i].tmp][randomness-1][nnx];
+ parts[pmap[y+ny][x+nx]>>8].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;
break;
}
}