summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJacob1 <jfu614@gmail.com>2012-05-24 18:07:31 (GMT)
committer Jacob1 <jfu614@gmail.com>2012-05-24 18:07:31 (GMT)
commit1fb778724329782bb5616da032742dce4dbea131 (patch)
tree99bddde4df728f7af32cb4962a509aee7867ae5f /src
parent9a179651ee9826f4c0b7df6c57aa75d8101baf5e (diff)
downloadpowder-1fb778724329782bb5616da032742dce4dbea131.zip
powder-1fb778724329782bb5616da032742dce4dbea131.tar.gz
VOID & PVOD can be set to only eat/not eat certain things
Diffstat (limited to 'src')
-rw-r--r--src/powder.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index a1187b1..700a6d5 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -344,7 +344,8 @@ int try_move(int i, int x, int y, int nx, int ny)
}
if ((r&0xFF)==PT_VOID || (r&0xFF)==PT_PVOD) //this is where void eats particles
{
- kill_part(i);
+ if(!parts[r>>8].ctype || (parts[r>>8].ctype==parts[i].type)!=(parts[r>>8].tmp&1))
+ kill_part(i);
return 0;
}
if ((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) //this is where blackhole eats particles