Correct save reloading, add Vac and NGrav tools

3 files changed, 4 insertions, 3 deletions

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 2a62606..3031fb6 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -612,7 +612,7 @@ void GameController::ReloadSim()
 {
 	if(gameModel->GetSave() && gameModel->GetSave()->GetGameSave())
 	{
-		gameModel->GetSimulation()->Load(gameModel->GetSave()->GetGameSave());
+		gameModel->SetSave(gameModel->GetSave());
 	}
 }
 
diff --git a/src/game/GameController.h b/src/game/GameController.h
index e75cf49..ecbe9b3 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -78,6 +78,7 @@ public:
 	void SetActiveMenu(Menu * menu);
 	void SetActiveTool(int toolSelection, Tool * tool);
 	void SetColour(ui::Colour colour);
+	void SetToolStrength(float value);
 	void OpenSearch();
 	void OpenLogin();
 	void OpenTags();
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 2ae0713..5c9344d 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -281,13 +281,13 @@ SaveInfo * GameModel::GetSave()
 
 void GameModel::SetSave(SaveInfo * newSave)
 {
-	if(currentSave)
+	if(currentSave != newSave)
 		delete currentSave;
 	currentSave = newSave;
 	if(currentSave && currentSave->GetGameSave())
 	{
 		GameSave * saveData = currentSave->GetGameSave();
-		SetPaused(saveData->paused);
+		SetPaused(saveData->paused & GetPaused());
 		sim->gravityMode = saveData->gravityMode;
 		sim->air->airMode = saveData->airMode;
 		sim->legacy_enable = saveData->legacyEnable;