mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-19 22:51:30 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bug with checking for dangerous particle near foot. Collide code a

Browse Source 
liitle more logical now.
This commit is contained in:
savask
2010-08-13 19:09:24 +08:00
committed by FacialTurd
parent e02d78c85d
commit 48bfba2677
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
powder.c
View File

@@ -2196,9 +2196,9 @@ void update_particles_i(pixel *vid, int start, int inc){
} }
//Collision checks //Collision checks
for(ny = 0; ny<=2+(int)parts[i].vy; ny++) for(ny = -2-(int)parts[i].vy; ny<=0; ny++)
{ {
r = pmap[(int)(player[8]-ny)][(int)(player[7]+0.5)]; //This is to make coding more pleasant :-) r = pmap[(int)(player[8]+ny)][(int)(player[7]+0.5)]; //This is to make coding more pleasant :-)
//For left leg //For left leg
if (r && (r&0xFF)!=PT_STKM) if (r && (r&0xFF)!=PT_STKM)
@@ -2214,13 +2214,13 @@ void update_particles_i(pixel *vid, int start, int inc){
} }
else else
{ {
player[8] -= ny+1; player[8] += ny-1;
parts[i].vy -= 0.5*parts[i].vy; parts[i].vy -= 0.5*parts[i].vy;
} }
player[9] = player[7]; player[9] = player[7];
} }
r = pmap[(int)(player[16]-ny)][(int)(player[15]+0.5)]; r = pmap[(int)(player[16]+ny)][(int)(player[15]+0.5)];
//For right leg //For right leg
if (r && (r&0xFF)!=PT_STKM) if (r && (r&0xFF)!=PT_STKM)
@@ -2236,7 +2236,7 @@ void update_particles_i(pixel *vid, int start, int inc){
} }
else else
{ {
player[16] -= ny+1; player[16] += ny-1;
parts[i].vy -= 0.5*parts[i].vy; parts[i].vy -= 0.5*parts[i].vy;
} }
player[17] = player[15]; player[17] = player[15];
@@ -2265,7 +2265,7 @@ void update_particles_i(pixel *vid, int start, int inc){
} }
//If legs touch something //If legs touch something
r = pmap[(int)(player[8]+1.5)][(int)(player[7]+0.5)]; r = pmap[(int)(player[8]+0.5)][(int)(player[7]+0.5)];
if((r&0xFF)==PT_SPRK && r && (r>>8)<NPART) //If on charge if((r&0xFF)==PT_SPRK && r && (r>>8)<NPART) //If on charge
{ {
parts[i].life -= (int)(rand()/1000)+38; parts[i].life -= (int)(rand()/1000)+38;
@@ -2286,7 +2286,7 @@ void update_particles_i(pixel *vid, int start, int inc){
if ((r&0xFF)==PT_PLUT) //If on plut if ((r&0xFF)==PT_PLUT) //If on plut
parts[i].life -= 1; parts[i].life -= 1;
r = pmap[(int)(player[16]+1.5)][(int)(player[15]+0.5)]; r = pmap[(int)(player[16]+0.5)][(int)(player[15]+0.5)];
if((r&0xFF)==PT_SPRK && r && (r>>8)<NPART) //If on charge if((r&0xFF)==PT_SPRK && r && (r>>8)<NPART) //If on charge
{ {
parts[i].life -= (int)(rand()/1000)+38; parts[i].life -= (int)(rand()/1000)+38;