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

Some fixes for stick mans.

Browse Source
This commit is contained in:
savask 2011-05-26 23:19:40 +07:00 committed by Simon Robertshaw
parent e42e7d019e
commit 7f245483a2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/elements/stkm.c
View File

@ -192,8 +192,10 @@ int update_STKM(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (!r || (r>>8)>=NPART) if (!r || (r>>8)>=NPART)
r = photons[y+ry][x+rx]; r = photons[y+ry][x+rx];
if (!r || (r>>8)>=NPART)
if ((!r || (r>>8)>=NPART) && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue; continue;
if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT) if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{ {
player[2] = r&0xFF; //Current element player[2] = r&0xFF; //Current element

8
src/elements/stkm2.c
View File

@ -192,8 +192,10 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (!r || (r>>8)>=NPART) if (!r || (r>>8)>=NPART)
r = photons[y+ry][x+rx]; r = photons[y+ry][x+rx];
if (!r || (r>>8)>=NPART)
if ((!r || (r>>8)>=NPART) && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue; continue;
if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT) if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{ {
player2[2] = r&0xFF; //Current element player2[2] = r&0xFF; //Current element
@ -304,7 +306,7 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
r = pmap[(int)(player2[8]+ry)][(int)(player2[7]+0.5)]; //This is to make coding more pleasant :-) r = pmap[(int)(player2[8]+ry)][(int)(player2[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_STKM2)
{ {
if ((r&0xFF)<PT_NUM && (ptypes[r&0xFF].state == ST_LIQUID || (r&0xFF) == PT_LNTG)) //Liquid checks if ((r&0xFF)<PT_NUM && (ptypes[r&0xFF].state == ST_LIQUID || (r&0xFF) == PT_LNTG)) //Liquid checks
{ {
@ -329,7 +331,7 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
r = pmap[(int)(player2[16]+ry)][(int)(player2[15]+0.5)]; r = pmap[(int)(player2[16]+ry)][(int)(player2[15]+0.5)];
//For right leg //For right leg
if (r && (r&0xFF)!=PT_STKM) if (r && (r&0xFF)!=PT_STKM2)
{ {
if ((r&0xFF)<PT_NUM && (ptypes[r&0xFF].state == ST_LIQUID || (r&0xFF) == PT_LNTG)) if ((r&0xFF)<PT_NUM && (ptypes[r&0xFF].state == ST_LIQUID || (r&0xFF) == PT_LNTG))
{ {