mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 20:42:36 +02:00
Code Issues Projects Releases Wiki Activity

stop neut from dragging particles inside energy walls, fixes jacob#18

Browse Source
This commit is contained in:
mniip
2014-01-30 22:55:55 +04:00
parent 250b522221
commit 1266307070
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulation/Simulation.cpp
View File

@@ -2345,6 +2345,8 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
if (s && !(elements[s&0xFF].Properties&PROP_NEUTPENETRATE)) if (s && !(elements[s&0xFF].Properties&PROP_NEUTPENETRATE))
return 1; // if the element currently underneath neutron isn't NEUTPENETRATE, don't move anything except the neutron return 1; // if the element currently underneath neutron isn't NEUTPENETRATE, don't move anything except the neutron
// if nothing is currently underneath neutron, only move target particle // if nothing is currently underneath neutron, only move target particle
if(bmap[y/CELL][x/CELL] == WL_ALLOWENERGY)
return 1; // do not drag target particle into an energy only wall
if (s) if (s)
{ {
pmap[ny][nx] = (s&~(0xFF))|parts[s>>8].type; pmap[ny][nx] = (s&~(0xFF))|parts[s>>8].type;