summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-03-18 00:26:12 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2011-03-18 00:26:12 (GMT)
commit1802c160c48c1e36609ddd4246ff5b4913a087cb (patch)
tree396b7f8c13d94a6aa8840dc7d8ffbcb0f97dd02d /src
parent495eda27a5f648c2583be812c48737399b66da58 (diff)
downloadpowder-1802c160c48c1e36609ddd4246ff5b4913a087cb.zip
powder-1802c160c48c1e36609ddd4246ff5b4913a087cb.tar.gz
Remove code to delete SPAWN when stickman produced
Code doesn't actually do anything in official source, due to operator precedence and lack of brackets.
Diffstat (limited to 'src')
-rw-r--r--src/powder.c64
1 files changed, 16 insertions, 48 deletions
diff --git a/src/powder.c b/src/powder.c
index 61cf2ed..5ce7575 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -753,29 +753,14 @@ inline int create_part(int p, int x, int y, int t)
{
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].y = (float)y;
- parts[i].type = PT_STKM;
- parts[i].vx = 0;
- parts[i].vy = 0;
- parts[i].life = 100;
- parts[i].ctype = 0;
- parts[i].temp = ptypes[t].heat;
- }
-
-
+ parts[i].x = (float)x;
+ parts[i].y = (float)y;
+ parts[i].type = PT_STKM;
+ parts[i].vx = 0;
+ parts[i].vy = 0;
+ parts[i].life = 100;
+ parts[i].ctype = 0;
+ parts[i].temp = ptypes[t].heat;
player[3] = x-1; //Setting legs positions
player[4] = y+6;
@@ -803,7 +788,6 @@ inline int create_part(int p, int x, int y, int t)
{
return -1;
}
- //kill_part(playerspawn);
create_part(-1,x,y,PT_SPAWN);
ISSPAWN1 = 1;
}
@@ -811,29 +795,14 @@ inline int create_part(int p, int x, int y, int t)
{
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].y = (float)y;
- parts[i].type = PT_STKM2;
- parts[i].vx = 0;
- parts[i].vy = 0;
- parts[i].life = 100;
- parts[i].ctype = 0;
- parts[i].temp = ptypes[t].heat;
- }
-
-
+ parts[i].x = (float)x;
+ parts[i].y = (float)y;
+ parts[i].type = PT_STKM2;
+ parts[i].vx = 0;
+ parts[i].vy = 0;
+ parts[i].life = 100;
+ parts[i].ctype = 0;
+ parts[i].temp = ptypes[t].heat;
player2[3] = x-1; //Setting legs positions
player2[4] = y+6;
@@ -861,7 +830,6 @@ inline int create_part(int p, int x, int y, int t)
{
return -1;
}
- //kill_part(player2spawn);
create_part(-1,x,y,PT_SPAWN2);
ISSPAWN2 = 1;
}