matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy

Browse Source
This commit is contained in:
Simon 2011-01-08 21:05:52 +00:00
commit 75e898e45b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/powder.h
View File

@ -649,6 +649,7 @@ static int lolzrule[9][9] =
}; };
int portal[MAX_TEMP/100][8][80]; int portal[MAX_TEMP/100][8][80];
float portaltemp[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]; int wireless[MAX_TEMP/100][2];
extern int isplayer; extern int isplayer;

3
src/powder.c
View File

@ -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; portal[parts[i].tmp][count-1][nnx] = parts[r>>8].type;
portaltemp[parts[i].tmp][count-1][nnx] = parts[r>>8].temp; 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) if(parts[r>>8].type==PT_SPRK)
parts[r>>8].type = parts[r>>8].ctype; parts[r>>8].type = parts[r>>8].ctype;
else 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]); 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].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; portal[parts[i].tmp][randomness-1][nnx] = 0;
portaltemp[parts[i].tmp][randomness-1][nnx] = 0; portaltemp[parts[i].tmp][randomness-1][nnx] = 0;
portalctype[parts[i].tmp][randomness-1][nnx] = 0;
break; break;
} }
} }