Going to sleep

.gitignore

@@ -18,6 +18,7 @@ lib/libS2M.so
 lib/libS2M.a
 test/platformer/test
 test/blackwindow/blackwindow
+test/pmates/pmates
 
 # Packages #
 ############

src/S2M.h

@@ -121,4 +121,10 @@ void S2M_UpdateRoom() {
 void S2M_Update() {
 	S2M_UpdateRoom();
 	S2M_UpdateGraphics();
+}
+
+void S2M_ExitGame() {
+	delete gGraphics;
+	delete gRoom;
+	cout << "Exiting SDL2Me... Goodbye!" << endl;
 }

src/graphics.cpp

@@ -82,17 +82,12 @@ Graphics::Graphics(int logWidth, int logHeight, string winCaption, Options * opt
 }
 
 Graphics::~Graphics() {
-	cout << "Exiting game... Bye!";
+	/**/ cout << "Cleaning Graphics" << endl;
 	for (int i = 0; i < sprites.size(); i++) {
 		delete sprites[i];
 	}
-	for (int i = 0; i < gRoom->backgrounds.size(); i++) {
-		delete gRoom->backgrounds[i];
-	}
 	SDL_DestroyRenderer( renderer );
 	SDL_DestroyWindow( window );
-	window = NULL;
-	renderer = NULL;
 	IMG_Quit();
 	SDL_Quit();
 }

src/object.cpp

@@ -46,7 +46,8 @@ Object::Object(float x, float y) {
 }
 
 Object::~Object() {
-
+	/**/cout << "$";
+	if (sprite) delete sprite;
 }
 
 void Object::setAnimation(int i) {

src/room.cpp

@@ -79,18 +79,32 @@ Room::Room() {
 	width = gGraphics->getGameWidth();
 	height = gGraphics->getGameHeight();
 	camera = nullptr;
+	nextRoom = nullptr;
+	prevRoom = nullptr;
 }
 
 Room::Room(int w, int h) {
 	width = w;
 	height = h;
 	camera = nullptr;
+	nextRoom = nullptr;
+	prevRoom = nullptr;
 }
 
 Room::~Room() {
+	/**/cout << "Cleaning Room" << endl;
+	if (nextRoom) { cout << "-> Cleaning next Room" << endl; delete nextRoom; }
+	if (prevRoom) { cout << "-> Cleaning previous Room" << endl; delete prevRoom; }
+	/**/cout << "-> Cleaning Objects (if any): ";
 	for (int i = 0; i < objects.size(); i++) {
-		delete objects[i];
+		//delete objects[i];
 	}
+	/**/cout << endl;
+	/**/cout << "-> Cleaning Backgrounds (if any): ";
+	for (int i = 0; i < backgrounds.size(); i++) {
+		//delete backgrounds[i]; // Backgrounds are not dynamically created yet.
+	}
+	/**/cout << endl;
 }
 
 int Room::getWidth() {
@@ -392,8 +406,9 @@ Background::Background(string filename, char s, float xspe, float yspe, float d)
 }
 
 Background::~Background() {
-	/*SDL_DestroyTexture(texture);
-	SDL_DestroyTexture(image);*/ //Da SegFault si una no está inicializada
+	/**/cout << "|";
+	SDL_DestroyTexture(texture);
+	//SDL_DestroyTexture(image); //Da SegFault si una no está inicializada
 }
 
 int Background::getWidth() {

test/platformer/main.cpp

@@ -113,7 +113,7 @@ int main( int argc, char* args[] ) {
 
 		CreditRoom *r = dynamic_cast<CreditRoom*>(gRoom);
 		if (r) {
-			if (r->mode) S2M_GoToRoom<TFlipExpo>(room2);
+			if (r->mode) S2M_GoToRoom<TFlipExpo>(room);
 		}
 
 		if (SDL_PollEvent(&e) != 0) {
@@ -148,12 +148,13 @@ int main( int argc, char* args[] ) {
 		}
 
 		if (gJoystick->getBtnPressed(2)) {
-			S2M_GoToRoom<TFlipExpo>(room2);
+			S2M_GoToRoom<TFlipExpo>(room);
 		}
 
 	    S2M_Update();
 	}
 
-	exit(0);
+	S2M_ExitGame();
+	return 0;
 }
 

test/pmates/main.cpp

@@ -21,6 +21,7 @@ int main( int argc, char* args[] ) {
 
 	}
 
+	S2M_ExitGame();
 	return 0;
 
 }