Fix gravity being assigned rather than increased by some elements

The-Powder-Toy · Jan 7, 2023 · 94ea50d · 94ea50d
1 parent 853c47b
commit 94ea50d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/simulation/elements/GBMB.cpp b/src/simulation/elements/GBMB.cpp
@@ -72,9 +72,9 @@ static int update(UPDATE_FUNC_ARGS)
 			}
 	}
 	if (parts[i].life>20)
-		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] = 20;
+		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += 20;
 	else if (parts[i].life>=1)
-		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] = -80;
+		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += -80;
 	return 0;
 }
 

diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp
@@ -64,7 +64,7 @@ static int update(UPDATE_FUNC_ARGS)
 		if (parts[i].temp<= -256.0f+273.15f)
 			parts[i].temp = -256.0f+273.15f;
 
-		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] = 0.2f*(parts[i].temp-273.15);
+		sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += 0.2f*(parts[i].temp-273.15);
 		for (rx=-2; rx<3; rx++)
 			for (ry=-2; ry<3; ry++)
 				if (BOUNDS_CHECK && (rx || ry))

diff --git a/src/simulation/elements/GRVT.cpp b/src/simulation/elements/GRVT.cpp
@@ -59,7 +59,7 @@ static int update(UPDATE_FUNC_ARGS)
 	if (parts[i].tmp <= -100)
 		parts[i].tmp = -100;
 
-	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] = 0.2f*parts[i].tmp;
+	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += 0.2f*parts[i].tmp;
 	return 0;
 }
 

diff --git a/src/simulation/simtools/NGRV.cpp b/src/simulation/simtools/NGRV.cpp
@@ -13,6 +13,6 @@ void SimTool::Tool_NGRV()
 
 static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, int brushYy, float strength)
 {
-	sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] = strength*-5.0f;
+	sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] += strength*-5.0f;
 	return 1;
 }
diff --git a/src/simulation/simtools/PGRV.cpp b/src/simulation/simtools/PGRV.cpp
@@ -13,6 +13,6 @@ void SimTool::Tool_PGRV()
 
 static int perform(Simulation * sim, Particle * cpart, int x, int y, int brushX, int brushY, float strength)
 {
-	sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] = strength*5.0f;
+	sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] += strength*5.0f;
 	return 1;
 }