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

Makefile

@@ -35,7 +35,7 @@ build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -fram
 build/powder-x.jnilib: CFLAGS += -DMACOSX -DUSE_JNI -I/Library/Frameworks/Lua.framework/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA
 build/powder-x.jnilib: LFLAGS := -lm -lbz2 -lfftw3f -framework Lua -framework JavaVM -framework Cocoa -framework OpenGL
 
-CFLAGS += -DGRAVFFT -DLUACONSOLE
+CFLAGS += -DGRAVFFT -DLUACONSOLE -DUSE_SDL
 
 build/powder-release.exe: $(SOURCES) generate build/powder-res.o
 	$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) build/powder-res.o -o $@

src/client/GameSave.cpp

@@ -22,6 +22,8 @@ gravityMode(save.gravityMode),
 airMode(save.airMode),
 signs(save.signs)
 {
+	blockMap, blockMapPtr, fanVelX, fanVelXPtr, fanVelY, fanVelYPtr, particles = NULL;
+
 	setSize(save.blockWidth, save.blockHeight);
 
 	particlesCount = save.particlesCount;
@@ -33,6 +35,7 @@ signs(save.signs)
 
 GameSave::GameSave(int width, int height)
 {
+	blockMap, blockMapPtr, fanVelX, fanVelXPtr, fanVelY, fanVelYPtr, particles = NULL;
 	setSize(width, height);
 }
 
@@ -702,6 +705,8 @@ fin:
 	bson_destroy(&b);
 	if(freeIndices)
 		free(freeIndices);
+	if(partsSimIndex)
+		free(partsSimIndex);
 }
 
 void GameSave::readPSv(char * data, int dataLength)
@@ -1672,26 +1677,18 @@ fin:
 
 GameSave::~GameSave()
 {
-	if(blockWidth && blockHeight)
-	{
-		if(particles)
-		{
-			delete[] particles;
-		}
-		if(blockMap)
-		{
-			delete[] blockMapPtr;
-			delete[] blockMap;
-		}
-		if(fanVelX)
-		{
-			delete[] fanVelXPtr;
-			delete[] fanVelX;
-		}
-		if(fanVelY)
-		{
-			delete[] fanVelYPtr;
-			delete[] fanVelY;
-		}
-	}
+	if(particles)
+		delete[] particles;
+	if(blockMap)
+		delete[] blockMap;
+	if(blockMapPtr)
+		delete[] blockMapPtr;
+	if(fanVelX)
+		delete[] fanVelX;
+	if(fanVelXPtr)
+		delete[] fanVelXPtr;
+	if(fanVelY)
+		delete[] fanVelY;
+	if(fanVelYPtr)
+		delete[] fanVelYPtr;
 }

src/console/ConsoleController.cpp

@@ -70,6 +70,11 @@ ConsoleView * ConsoleController::GetView()
 }
 
 ConsoleController::~ConsoleController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == consoleView)
+		ui::Engine::Ref().CloseWindow();
+	if(callback)
+		delete callback;
+	delete consoleModel;
+	delete consoleView;
 }
 

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++)

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++)

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()

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)

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;

src/interface/Textblock.cpp

@@ -28,8 +28,8 @@ void Textblock::SetText(std::string text)
 
 void Textblock::updateMultiline()
 {
-	char * rawText = (char*)malloc(text.length()+1);
-	memcpy(rawText, text.c_str(), text.length());
+	char * rawText = new char[text.length()+1];
+	std::copy(text.begin(), text.end(), rawText);
 	rawText[text.length()] = 0;
 
 	int lines = 1;
@@ -60,7 +60,8 @@ void Textblock::updateMultiline()
 	{
 		Size.Y = lines*12;
 	}
-	textLines = rawText;
+	textLines = std::string(rawText);
+	delete[] rawText;
 }
 
 void Textblock::Draw(const Point &screenPos)

src/interface/Textbox.cpp

@@ -129,10 +129,10 @@ void Textbox::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 	{
 		if(masked)
 		{
-			char * tempText = new char[text.length()];
+			char * tempText = new char[text.length()+1];
 			std::fill(tempText, tempText+text.length(), 0x8d);
 			tempText[text.length()] = 0;
-			displayText = tempText;
+			displayText = std::string(tempText);
 			delete tempText;
 		}
 		else

src/localbrowser/LocalBrowserController.cpp

@@ -130,6 +130,11 @@ void LocalBrowserController::Exit()
 }
 
 LocalBrowserController::~LocalBrowserController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == browserView)
+		ui::Engine::Ref().CloseWindow();
+	if(callback)
+		delete callback;
+	delete localBrowserModel;
+	delete localBrowserView;
 }
 

src/login/LoginController.cpp

@@ -49,5 +49,6 @@ LoginController::~LoginController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete loginModel;
+	delete loginView;
 }
 

src/options/OptionsController.cpp

@@ -70,5 +70,8 @@ OptionsController::~OptionsController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete model;
+	delete view;
+	if(callback)
+		delete callback;
 }
 

src/preview/PreviewController.cpp

@@ -103,5 +103,8 @@ PreviewController::~PreviewController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete previewModel;
+	delete previewView;
+	if(callback)
+		delete callback;
 }
 

src/render/RenderController.cpp

@@ -61,6 +61,9 @@ RenderController::~RenderController() {
 	{
 		ui::Engine::Ref().CloseWindow();
 	}
+	if(callback)
+		delete callback;
 	delete renderModel;
+	delete renderView;
 }
 

src/search/SearchController.cpp

@@ -89,6 +89,7 @@ SearchController::~SearchController()
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete searchModel;
+	delete searchView;
 }
 
 void SearchController::DoSearch(std::string query)

src/search/SearchView.cpp

@@ -210,6 +210,13 @@ void SearchView::doSearch()
 
 SearchView::~SearchView()
 {
+	RemoveComponent(nextButton);
+	RemoveComponent(previousButton);
+	RemoveComponent(infoLabel);
+
+	delete nextButton;
+	delete previousButton;
+	delete infoLabel;
 }
 
 void SearchView::NotifySortChanged(SearchModel * sender)

src/simulation/Simulation.cpp

@@ -4228,8 +4228,12 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
 
 Simulation::~Simulation()
 {
+	delete[] elements;
+	delete[] platent;
 	delete grav;
 	delete air;
+	for(int i = 0; i < tools.size(); i++)
+		delete tools[i];
 }
 
 Simulation::Simulation():

src/ssave/SSaveController.cpp

@@ -51,5 +51,9 @@ void SSaveController::Exit()
 SSaveController::~SSaveController() {
 	if(ui::Engine::Ref().GetWindow() == ssaveView)
 		ui::Engine::Ref().CloseWindow();
+	delete ssaveModel;
+	delete ssaveView;
+	if(callback)
+		delete callback;
 }
 

src/tags/TagsController.cpp

@@ -50,6 +50,11 @@ void TagsController::Exit()
 }
 
 TagsController::~TagsController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == tagsView)
+		ui::Engine::Ref().CloseWindow();
+	delete tagsModel;
+	delete tagsView;
+	if(callback)
+		delete callback;
 }