add RESTRICT_VERSION check to digitation stuff, update readme date

The-Powder-Toy · Mar 10, 2018 · c861d69 · c861d69
1 parent f2ac8a9
commit c861d69
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-The Powder Toy - November 2017
+The Powder Toy - March 2018
 ==========================
 
 Get the latest version here: http://powdertoy.co.uk/Download.html

diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
@@ -2246,6 +2246,15 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
 					RESTRICTVERSION(93, 0);
 					fromNewerVersion = true; // TODO: remove on 93.0 release
 				}
+				if (particles[i].type == PT_TSNS || particles[i].type == PT_PSNS
+				        || particles[i].type == PT_HSWC || particles[i].type == PT_PUMP)
+				{
+					if (particles[i].tmp == 1)
+					{
+						RESTRICTVERSION(93, 0);
+						fromNewerVersion = true; // TODO: remove on 93.0 release
+					}
+				}
 				if (PMAPBITS > 8)
 				{
 					if (Simulation::TypeInCtype(particles[i].type) && particles[i].ctype > 0xFF)

diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -4113,12 +4113,10 @@ void Simulation::UpdateParticles(int start, int end)
 							kill_part(i);
 							goto killed;
 						}
-						if (part_change_type(i,x,y,t))
-							goto killed;
 						// part_change_type could refuse to change the type and kill the particle
 						// for example, changing type to STKM but one already exists
 						// we need to account for that to not cause simulation corruption issues
-						if (parts[i].type == PT_NONE)
+						if (part_change_type(i,x,y,t))
 							goto killed;
 
 						if (t==PT_FIRE || t==PT_PLSM || t==PT_CFLM)