mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-07-31 05:30:23 +02:00
Code Issues Projects Releases Wiki Activity

Increase speed of MIX tool and make it work with liquids (#306)

Browse Source 
* Make MIX tool work with liquids and gases
This commit is contained in:
cxi
2016-07-12 20:34:08 -07:00
committed by jacob1
parent 5b525852b4
commit 7251f645e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/simtools/Mix.cpp
View File

@@ -19,7 +19,7 @@ int Tool_Mix::Perform(Simulation * sim, Particle * cpart, int x, int y, float st
int distance = (int)(std::pow(strength, .5f) * 10); int distance = (int)(std::pow(strength, .5f) * 10);
if(!(sim->elements[thisPart&0xFF].Properties & TYPE_PART)) if(!(sim->elements[thisPart&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS)))
return 0; return 0;
int newX = x + (rand() % distance) - (distance/2); int newX = x + (rand() % distance) - (distance/2);
@@ -32,7 +32,7 @@ int Tool_Mix::Perform(Simulation * sim, Particle * cpart, int x, int y, float st
if(!thatPart) if(!thatPart)
return 0; return 0;
if(!(sim->elements[thatPart&0xFF].Properties & TYPE_PART)) if(!(sim->elements[thatPart&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS)))
return 0; return 0;
sim->pmap[y][x] = thatPart; sim->pmap[y][x] = thatPart;