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

Remove code to delete SPAWN when stickman produced

Browse Source 
Code doesn't actually do anything in official source, due to operator
precedence and lack of brackets.
This commit is contained in:
jacksonmj 2011-03-18 00:26:12 +00:00
parent 495eda27a5
commit 1802c160c4
1 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/powder.c
View File

@ -752,18 +752,6 @@ inline int create_part(int p, int x, int y, int t)
if (t==PT_STKM) if (t==PT_STKM)
{ {
if (isplayer==0) if (isplayer==0)
{
if ((pmap[y][x]&0xFF)==PT_SPAWN)
{
parts[pmap[y][x]>>8].type = PT_STKM;
parts[pmap[y][x]>>8].vx = 0;
parts[pmap[y][x]>>8].vy = 0;
parts[pmap[y][x]>>8].life = 100;
parts[pmap[y][x]>>8].ctype = 0;
parts[pmap[y][x]>>8].temp = ptypes[t].heat;
}
else
{ {
parts[i].x = (float)x; parts[i].x = (float)x;
parts[i].y = (float)y; parts[i].y = (float)y;
@ -773,9 +761,6 @@ inline int create_part(int p, int x, int y, int t)
parts[i].life = 100; parts[i].life = 100;
parts[i].ctype = 0; parts[i].ctype = 0;
parts[i].temp = ptypes[t].heat; parts[i].temp = ptypes[t].heat;
}
player[3] = x-1; //Setting legs positions player[3] = x-1; //Setting legs positions
player[4] = y+6; player[4] = y+6;
@ -803,25 +788,12 @@ inline int create_part(int p, int x, int y, int t)
{ {
return -1; return -1;
} }
//kill_part(playerspawn);
create_part(-1,x,y,PT_SPAWN); create_part(-1,x,y,PT_SPAWN);
ISSPAWN1 = 1; ISSPAWN1 = 1;
} }
if (t==PT_STKM2) if (t==PT_STKM2)
{ {
if (isplayer2==0) if (isplayer2==0)
{
if ((pmap[y][x]&0xFF)==PT_SPAWN2)
{
parts[pmap[y][x]>>8].type = PT_STKM2;
parts[pmap[y][x]>>8].vx = 0;
parts[pmap[y][x]>>8].vy = 0;
parts[pmap[y][x]>>8].life = 100;
parts[pmap[y][x]>>8].ctype = 0;
parts[pmap[y][x]>>8].temp = ptypes[t].heat;
}
else
{ {
parts[i].x = (float)x; parts[i].x = (float)x;
parts[i].y = (float)y; parts[i].y = (float)y;
@ -831,9 +803,6 @@ inline int create_part(int p, int x, int y, int t)
parts[i].life = 100; parts[i].life = 100;
parts[i].ctype = 0; parts[i].ctype = 0;
parts[i].temp = ptypes[t].heat; parts[i].temp = ptypes[t].heat;
}
player2[3] = x-1; //Setting legs positions player2[3] = x-1; //Setting legs positions
player2[4] = y+6; player2[4] = y+6;
@ -861,7 +830,6 @@ inline int create_part(int p, int x, int y, int t)
{ {
return -1; return -1;
} }
//kill_part(player2spawn);
create_part(-1,x,y,PT_SPAWN2); create_part(-1,x,y,PT_SPAWN2);
ISSPAWN2 = 1; ISSPAWN2 = 1;
} }