matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages 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
Show Stats 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
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
if (r && (r&0xFF)!=PT_STKM)
@ -2214,13 +2214,13 @@ void update_particles_i(pixel *vid, int start, int inc){
}
else
{
player[8] -= ny+1;
player[8] += ny-1;
parts[i].vy -= 0.5*parts[i].vy;
}
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
if (r && (r&0xFF)!=PT_STKM)
@ -2236,7 +2236,7 @@ void update_particles_i(pixel *vid, int start, int inc){
}
else
{
player[16] -= ny+1;
player[16] += ny-1;
parts[i].vy -= 0.5*parts[i].vy;
}
player[17] = player[15];
@ -2265,7 +2265,7 @@ void update_particles_i(pixel *vid, int start, int inc){
}
//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
{
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
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
{
parts[i].life -= (int)(rand()/1000)+38;