fix loading saves with stacked particles

src/gui/filebrowser/FileBrowserActivity.cpp

@@ -1,5 +1,6 @@
 #include <sstream>
 #include <iostream>
+#include <algorithm>
 #include "FileBrowserActivity.h"
 #include "gui/interface/Label.h"
 #include "gui/interface/Textbox.h"
@@ -58,7 +59,7 @@ class LoadFilesTask: public Task
 	virtual bool doWork()
 	{
 		std::vector<std::string> files = Client::Ref().DirectorySearch(directory, search, ".cps");
-
+		sort(files.rbegin(), files.rend());
 
 		notifyProgress(-1);
 		for(std::vector<std::string>::iterator iter = files.begin(), end = files.end(); iter != end; ++iter)

src/simulation/Simulation.cpp

@@ -123,15 +123,13 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
 			elementCount[parts[r>>8].type]--;
 			parts[r>>8] = tempPart;
 			i = r>>8;
-			pmap[y][x] = tempPart.type | i<<8;
 			elementCount[tempPart.type]++;
 		}
 		else if ((r = photons[y][x]))
 		{
 			elementCount[parts[r>>8].type]--;
 			parts[r>>8] = tempPart;
 			i = r>>8;
-			photons[y][x] = tempPart.type | i<<8;
 			elementCount[tempPart.type]++;
 		}
 		//Allocate new particle
@@ -144,7 +142,6 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
 			if (i > parts_lastActiveIndex)
 				parts_lastActiveIndex = i;
 			parts[i] = tempPart;
-			pmap[y][x] = tempPart.type | i<<8;
 			elementCount[tempPart.type]++;
 		}
 
@@ -194,6 +191,7 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
 	parts_lastActiveIndex = NPART-1;
 	force_stacking_check = true;
 	Element_PPIP::ppip_changed = 1;
+	RecalcFreeParticles(false);
 
 	// fix SOAP links using soapList, a map of old particle ID -> new particle ID
 	// loop through every old particle (loaded from save), and convert .tmp / .tmp2