Save local saves as current name option (overwrites them automatically). Fix filename not showing when first saving a local save

6 files changed, 44 insertions, 24 deletions

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 96f966c..dfe3a94 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -909,7 +909,7 @@ void GameController::OpenSearch()
 	ui::Engine::Ref().ShowWindow(search->GetView());
 }
 
-void GameController::OpenLocalSaveWindow()
+void GameController::OpenLocalSaveWindow(bool asCurrent)
 {
 	Simulation * sim = gameModel->GetSimulation();
 	GameSave * gameSave = sim->Save();
@@ -926,24 +926,32 @@ void GameController::OpenLocalSaveWindow()
 	else
 	{
 		std::string filename = "";
-		if (gameModel->GetFile())
-			filename = gameModel->GetFile()->GetDisplayName();
+		if (gameModel->GetSaveFile())
+			filename = gameModel->GetSaveFile()->GetDisplayName();
 		SaveFile tempSave(filename);
 		tempSave.SetGameSave(gameSave);
 
-		class LocalSaveCallback: public FileSavedCallback
+		if (!asCurrent || !gameModel->GetSaveFile())
 		{
-			GameController * c;
-		public:
-			LocalSaveCallback(GameController * _c): c(_c) {}
-			virtual  ~LocalSaveCallback() {};
-			virtual void FileSaved(SaveFile* file)
+			class LocalSaveCallback: public FileSavedCallback
 			{
-				c->gameModel->SetSaveFile(file);
-			}
-		};
+				GameController * c;
+			public:
+				LocalSaveCallback(GameController * _c): c(_c) {}
+				virtual  ~LocalSaveCallback() {};
+				virtual void FileSaved(SaveFile* file)
+				{
+					c->gameModel->SetSaveFile(file);
+				}
+			};
 
-		new LocalSaveActivity(tempSave, new LocalSaveCallback(this));
+			new LocalSaveActivity(tempSave, new LocalSaveCallback(this));
+		}
+		else if (gameModel->GetSaveFile())
+		{
+			Client::Ref().MakeDirectory(LOCAL_SAVE_DIR);
+			Client::Ref().WriteFile(gameSave->Serialise(), gameModel->GetSaveFile()->GetName());
+		}
 	}
 }
 
@@ -1209,9 +1217,9 @@ void GameController::ReloadSim()
 	{
 		gameModel->SetSave(gameModel->GetSave());
 	}
-	else if(gameModel->GetFile() && gameModel->GetFile()->GetGameSave())
+	else if(gameModel->GetSaveFile() && gameModel->GetSaveFile()->GetGameSave())
 	{
-		gameModel->SetSaveFile(gameModel->GetFile());
+		gameModel->SetSaveFile(gameModel->GetSaveFile());
 	}
 }
 
diff --git a/src/game/GameController.h b/src/game/GameController.h
index 14dbccb..2ac8bea 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -105,7 +105,7 @@ public:
 	void OpenLogin();
 	void OpenTags();
 	void OpenSavePreview(int saveID, int saveDate);
-	void OpenLocalSaveWindow();
+	void OpenLocalSaveWindow(bool asCurrent);
 	void OpenLocalBrowse();
 	void OpenOptions();
 	void OpenRenderOptions();
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index f905a1c..0a3c577 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -564,7 +564,7 @@ void GameModel::SetSave(SaveInfo * newSave)
 	UpdateQuickOptions();
 }
 
-SaveFile * GameModel::GetFile()
+SaveFile * GameModel::GetSaveFile()
 {
 	return currentFile;
 }
diff --git a/src/game/GameModel.h b/src/game/GameModel.h
index b4c0bd3..7288c32 100644
--- a/src/game/GameModel.h
+++ b/src/game/GameModel.h
@@ -144,7 +144,7 @@ public:
 
 	void SetVote(int direction);
 	SaveInfo * GetSave();
-	SaveFile * GetFile();
+	SaveFile * GetSaveFile();
 	Brush * GetBrush();
 	void SetSave(SaveInfo * newSave);
 	void SetSaveFile(SaveFile * newSave);
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 9a2f772..73b3833 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -181,7 +181,8 @@ GameView::GameView():
 	recording(false),
 	screenshotIndex(0),
 	recordingIndex(0),
-	toolTipPresence(0)
+	toolTipPresence(0),
+	currentSaveType(0)
 {
 	
 	int currentX = 1;
@@ -238,14 +239,14 @@ GameView::GameView():
         void ActionCallbackRight(ui::Button * sender)
         {
         	if(v->CtrlBehaviour())
-        		v->c->OpenLocalSaveWindow();
+        		v->c->OpenLocalSaveWindow(false);
         	else
 	            v->c->OpenSaveWindow();
         }
         void ActionCallbackLeft(ui::Button * sender)
         {
         	if(v->CtrlBehaviour())
-        		v->c->OpenLocalSaveWindow();
+        		v->c->OpenLocalSaveWindow(true);
         	else
 	            v->c->SaveAsCurrent();
         }
@@ -846,11 +847,15 @@ void GameView::NotifySaveChanged(GameModel * sender)
 		{
 			tagSimulationButton->SetText("[no tags set]");
 		}
+		currentSaveType = 1;
 	}
-	else if (sender->GetFile())
+	else if (sender->GetSaveFile())
 	{
-		((SplitButton*)saveSimulationButton)->SetShowSplit(false);
-		saveSimulationButton->SetText(sender->GetFile()->GetDisplayName());
+		if (ctrlBehaviour)
+			((SplitButton*)saveSimulationButton)->SetShowSplit(true);
+		else
+			((SplitButton*)saveSimulationButton)->SetShowSplit(false);
+		saveSimulationButton->SetText(sender->GetSaveFile()->GetDisplayName());
 		reloadButton->Enabled = true;
 		upVoteButton->Enabled = false;
 		upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0));
@@ -858,6 +863,7 @@ void GameView::NotifySaveChanged(GameModel * sender)
 		upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0));
 		tagSimulationButton->Enabled = false;
 		tagSimulationButton->SetText("[no tags set]");
+		currentSaveType = 2;
 	}
 	else
 	{
@@ -870,6 +876,7 @@ void GameView::NotifySaveChanged(GameModel * sender)
 		upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0));
 		tagSimulationButton->Enabled = false;
 		tagSimulationButton->SetText("[no tags set]");
+		currentSaveType = 0;
 	}
 }
 
@@ -1685,6 +1692,8 @@ void GameView::enableCtrlBehaviour()
 		saveSimulationButton->Appearance.TextInactive = saveSimulationButton->Appearance.TextHover = ui::Colour(0, 0, 0);
 		searchButton->Appearance.BackgroundInactive = searchButton->Appearance.BackgroundHover = ui::Colour(255, 255, 255);
 		searchButton->Appearance.TextInactive = searchButton->Appearance.TextHover = ui::Colour(0, 0, 0);
+		if (currentSaveType == 2)
+			((SplitButton*)saveSimulationButton)->SetShowSplit(true);
 		if(isMouseDown)
 		{
 			if(!shiftBehaviour)
@@ -1708,6 +1717,8 @@ void GameView::disableCtrlBehaviour()
 		searchButton->Appearance.BackgroundInactive = ui::Colour(0, 0, 0);
 		searchButton->Appearance.BackgroundHover = ui::Colour(20, 20, 20);
 		searchButton->Appearance.TextInactive = searchButton->Appearance.TextHover = ui::Colour(255, 255, 255);
+		if (currentSaveType == 2)
+			((SplitButton*)saveSimulationButton)->SetShowSplit(false);
 		if(!shiftBehaviour)
 			c->SetToolStrength(1.0f);
 		else
diff --git a/src/game/GameView.h b/src/game/GameView.h
index f36aef3..e17279f 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -55,6 +55,7 @@ private:
 	std::string buttonTip;
 	std::string introTextMessage;
 	int toolIndex;
+	int currentSaveType;
 
 	int infoTipPresence;
 	std::string toolTip;