diff options
| author | Simon <simon@hardwired.org.uk> | 2011-01-08 21:05:52 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-01-08 21:05:52 (GMT) |
| commit | 75e898e45ba03f4c80b50a91d1fc338bff2eccb7 (patch) | |
| tree | 362a3414bc225f3cf24a6a8c883e0e5b476dbfd6 | |
| parent | 764e3966bb1294fcb2d42812ad0f8d49747aebca (diff) | |
| parent | 0958a6e6da7ffd8c93779bfeb4552e18f593a090 (diff) | |
| download | powder-75e898e45ba03f4c80b50a91d1fc338bff2eccb7.zip powder-75e898e45ba03f4c80b50a91d1fc338bff2eccb7.tar.gz | |
Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy
| -rw-r--r-- | includes/powder.h | 1 | ||||
| -rw-r--r-- | src/powder.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/includes/powder.h b/includes/powder.h index 3e4d388..7b4a0ee 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -649,6 +649,7 @@ static int lolzrule[9][9] = }; int portal[MAX_TEMP/100][8][80]; float portaltemp[MAX_TEMP/100][8][80]; +int portalctype[MAX_TEMP/100][8][80]; int wireless[MAX_TEMP/100][2]; extern int isplayer; diff --git a/src/powder.c b/src/powder.c index f900846..6c2ea34 100644 --- a/src/powder.c +++ b/src/powder.c @@ -3338,6 +3338,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 @@ -3389,8 +3390,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; } } |