Fix ctrl+MIX not actually doing anything, and shift+MIX being too pow…

…erful
The-Powder-Toy · Apr 27, 2016 · 1c15b42 · 1c15b42
1 parent 57be4ef
commit 1c15b42
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/simulation/simtools/Mix.cpp b/src/simulation/simtools/Mix.cpp
@@ -17,7 +17,7 @@ int Tool_Mix::Perform(Simulation * sim, Particle * cpart, int x, int y, float st
 	if(rand() % 100 != 0)
 		return 0;
 
-	int distance = strength * 10;
+	int distance = (int)(std::pow(strength, .5) * 10);
 
 	if(!(sim->elements[thisPart&0xFF].Properties & TYPE_PART))
 		return 0;
@@ -42,6 +42,8 @@ int Tool_Mix::Perform(Simulation * sim, Particle * cpart, int x, int y, float st
 	sim->pmap[newY][newX] = thisPart;
 	sim->parts[thisPart>>8].x = newX;
 	sim->parts[thisPart>>8].y = newY;
+
+	return 1;
 }
 
 Tool_Mix::~Tool_Mix() {}