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

Another change to the eval_move check in create_part

Browse Source 
Creating a particle where there was a wall but no existing particle was
broken, since eval_move returns 1 for moving into empty space.
This commit is contained in:
jacksonmj 2012-01-26 01:20:14 +08:00 committed by Simon Robertshaw
parent ed2132b7d8
commit eaf2af6d40
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/powder.c
View File

@ -798,7 +798,11 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
return -1; return -1;
if (p==-1)//creating from anything but brush if (p==-1)//creating from anything but brush
{ {
if ((pmap[y][x] || bmap[y/CELL][x/CELL]) && eval_move(t, x, y, NULL)!=2) // If there is a particle, only allow creation if the new particle can occupy the same space as the existing particle
// If there isn't a particle but there is a wall, check whether the new particle is allowed to be in it
// (not "!=2" for wall check because eval_move returns 1 for moving into empty space)
// If there's no particle and no wall, assume creation is allowed
if (pmap[y][x] ? (eval_move(t, x, y, NULL)!=2) : (bmap[y/CELL][x/CELL] && eval_move(t, x, y, NULL)==0))
{ {
if ((pmap[y][x]&0xFF)!=PT_SPAWN&&(pmap[y][x]&0xFF)!=PT_SPAWN2) if ((pmap[y][x]&0xFF)!=PT_SPAWN&&(pmap[y][x]&0xFF)!=PT_SPAWN2)
{ {