Merge branch 'master' of github.com:FacialTurd/PowderToypp

5 files changed, 39 insertions, 21 deletions

diff --git a/src/game/Brush.h b/src/game/Brush.h
index 34354c0..0adcd95 100644
--- a/src/game/Brush.h
+++ b/src/game/Brush.h
@@ -25,8 +25,8 @@ protected:
 		if(!bitmap)
 			return;
 		if(outline)
-			free(outline);
-		outline = (unsigned char *)calloc(size.X*size.Y, sizeof(unsigned char));
+			delete[] outline;
+		outline = new unsigned char[size.X*size.Y];
 		for(int x = 0; x < size.X; x++)
 		{
 			for(int y = 0; y < size.Y; y++)
@@ -69,9 +69,9 @@ public:
 	}
 	virtual ~Brush() {
 		if(bitmap)
-			delete bitmap;
+			delete[] bitmap;
 		if(outline)
-			delete outline;
+			delete[] outline;
 	}
 	virtual void RenderRect(Graphics * g, ui::Point position1, ui::Point position2)
 	{
@@ -109,8 +109,8 @@ public:
 	virtual void GenerateBitmap()
 	{
 		if(bitmap)
-			free(bitmap);
-		bitmap = (unsigned char *)calloc((size.X*size.Y), sizeof(unsigned char));
+			delete[] bitmap;
+		bitmap = new unsigned char[size.X*size.Y];
 		for(int x = 0; x < size.X; x++)
 		{
 			for(int y = 0; y < size.Y; y++)
diff --git a/src/game/EllipseBrush.h b/src/game/EllipseBrush.h
index a02516e..9a75dfb 100644
--- a/src/game/EllipseBrush.h
+++ b/src/game/EllipseBrush.h
@@ -22,8 +22,8 @@ public:
 	virtual void GenerateBitmap()
 	{
 		if(bitmap)
-			free(bitmap);
-		bitmap = (unsigned char*)calloc((size.X*size.Y), sizeof(unsigned char));
+			delete[] bitmap;
+		bitmap = new unsigned char[size.X*size.Y];
 		int rx = radius.X;
 		int ry = radius.Y;
 		for(int x = 0; x <= radius.X*2; x++)
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index dfbd935..6ed6e0f 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -39,7 +39,7 @@ public:
 		{
 			try
 			{
-				cc->gameModel->SetSave(new SaveInfo(*(cc->search->GetLoadedSave())));
+				cc->gameModel->SetSave(cc->search->GetLoadedSave());
 			}
 			catch(GameModelException & ex)
 			{
@@ -163,6 +163,7 @@ GameController::~GameController()
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete gameModel;
+	delete gameView;
 }
 
 GameView * GameController::GetView()
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 054a415..7a1d231 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -170,10 +170,6 @@ GameModel::~GameModel()
 
 	for(int i = 0; i < menuList.size(); i++)
 	{
-		for(int j = 0; i < menuList[i]->GetToolList().size(); i++)
-		{
-			delete menuList[i]->GetToolList()[j];
-		}
 		delete menuList[i];
 	}
 	for(int i = 0; i < brushList.size(); i++)
@@ -186,6 +182,8 @@ GameModel::~GameModel()
 		delete clipboard;
 	if(stamp)
 		delete stamp;
+	if(currentSave)
+		delete currentSave;
 	//if(activeTools)
 	//	delete[] activeTools;
 }
@@ -282,8 +280,15 @@ SaveInfo * GameModel::GetSave()
 void GameModel::SetSave(SaveInfo * newSave)
 {
 	if(currentSave != newSave)
-		delete currentSave;
-	currentSave = newSave;
+	{
+		if(currentSave)
+			delete currentSave;
+		if(newSave == NULL)
+			currentSave = NULL;
+		else
+			currentSave = new SaveInfo(*newSave);
+	}
+
 	if(currentSave && currentSave->GetGameSave())
 	{
 		GameSave * saveData = currentSave->GetGameSave();
@@ -451,12 +456,15 @@ void GameModel::ClearSimulation()
 
 void GameModel::SetStamp(GameSave * save)
 {
-	if(stamp)
-		delete stamp;
-	if(save)
-		stamp = new GameSave(*save);
-	else
-		stamp = NULL;
+	if(stamp != save)
+	{
+		if(stamp)
+			delete stamp;
+		if(save)
+			stamp = new GameSave(*save);
+		else
+			stamp = NULL;
+	}
 }
 
 void GameModel::SetPlaceSave(GameSave * save)
diff --git a/src/game/Menu.h b/src/game/Menu.h
index 1824190..261193e 100644
--- a/src/game/Menu.h
+++ b/src/game/Menu.h
@@ -24,6 +24,15 @@ public:
 
 	}
 
+	virtual ~Menu()
+	{
+		for(int i = 0; i < tools.size(); i++)
+		{
+			delete tools[i];
+		}
+		tools.clear();
+	}
+
 	vector<Tool*> GetToolList()
 	{
 		return tools;