Fix: Algunas texturas desaparecen al bloquearse la pantalla

Makefile

@@ -2,7 +2,7 @@ executable = jaildoctors_dilemma
 source = source/*.cpp source/common/*.cpp
 appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
-version = v1.03
+version = v1.04
 
 # Release names
 windowsRelease = $(executable)-$(version)-win32-x64.zip
@@ -12,8 +12,6 @@ linuxRelease = $(executable)-$(version)-linux.tar.gz
 
 windows:
 	@echo off
-	powershell if (Test-Path data\config) {Remove-Item data\config -Recurse -Force}
-	powershell if (-not (Test-Path data\config)) {New-Item data\config -ItemType Directory}
 	g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
 	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
 
@@ -21,11 +19,9 @@ windows_release:
 	@echo off
 
 # Remove data
-	powershell if (Test-Path data\config) {Remove-Item data\config -Recurse -Force}
 	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
 
 # Create folders
-	powershell if (-not (Test-Path data\config)) {New-Item data\config -ItemType Directory}
 	powershell if (-not (Test-Path $(releaseFolder))) {New-Item $(releaseFolder) -ItemType Directory}
 
 # Copy data
@@ -37,6 +33,10 @@ windows_release:
 # Remove data
 	powershell if (Test-Path "$(releaseFolder)\data\room\map.world") {Remove-Item "$(releaseFolder)\data\room\map.world" -Recurse -Force}
 	powershell if (Test-Path "$(releaseFolder)\data\room\standard.tsx") {Remove-Item "$(releaseFolder)\data\room\standard.tsx" -Recurse -Force}
+	powershell if (Test-Path "$(releaseFolder)\data\config") {Remove-Item "$(releaseFolder)\data\config" -Recurse -Force}
+
+# Create data
+	powershell if (-not (Test-Path "$(releaseFolder)\data\config")) {New-Item "$(releaseFolder)\data\config" -ItemType Directory}
 
 # Build
 	g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
@@ -50,13 +50,10 @@ windows_release:
 	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
 
 macos:
-	rm -rdf data/config
-	mkdir -p data/config
 	clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos
 
 macos_release:
 # Remove data and possible data
-	rm -rdf data/config
 	rm -rdf "$(releaseFolder)"
 	rm -rdf Frameworks
 	rm -f tmp.dmg
@@ -64,7 +61,6 @@ macos_release:
 	rm -f "$(macosAppleSiliconRelease)"
 
 # Create folders
-	mkdir -p data/config
 	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
 	mkdir -p "$(releaseFolder)/$(appName).app/Contents/MacOS"
 	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
@@ -78,10 +74,16 @@ macos_release:
 # Delete data
 	rm -f "$(releaseFolder)/$(appName).app/Contents/Resources/data/room/map.world"
 	rm -f "$(releaseFolder)/$(appName).app/Contents/Resources/data/room/standard.tsx"
+	rm -rdf "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
 
 # Copy files
 	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
 	cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
+	cp LICENSE "$(releaseFolder)"
+	cp README.md "$(releaseFolder)"
 
 # Build INTEL
 	clang++ $(source) -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
@@ -104,18 +106,14 @@ macos_release:
 	rm -rdf "$(releaseFolder)"
 
 linux:
-	rm -rdf data/config
-	mkdir -p data/config
 	g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
 	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
 
 linux_release:
 # Remove data
-	rm -rdf data/config
 	rm -rdf $(releaseFolder)
 
 # Create folders
-	mkdir -p data/config
 	mkdir -p $(releaseFolder)
 
 # Copy data
@@ -126,6 +124,10 @@ linux_release:
 # Delete data
 	rm -f "$(releaseFolder)/data/room/map.world"
 	rm -f "$(releaseFolder)/data/room/standard.tsx"
+	rm -rdf "$(releaseFolder)/data/config"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/data/config"
 
 # Build
 	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable)

data/room/14.room

@@ -48,9 +48,9 @@ animation=tuno.ani
 width=16
 height=16
 x=28
-y=8
+y=6
 vx=0
-vy=0.4
+vy=-0.4
 x1=28
 y1=2
 x2=28

jaildoctors_dilemma_debug.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.jaildoctors_dilemma_debug</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

source/common/utils.h

@@ -86,6 +86,8 @@ struct options_t
 	palette_e palette;	   // Paleta de colores a usar en el juego
 	bool console;		   // Indica si ha de mostrar información por la consola de texto
 	cheat_t cheat;		   // Contiene trucos y ventajas para el juego
+	int rooms;			   // Cantidad de habitaciones visitadas
+	int items;			   // Cantidad de items obtenidos
 };
 
 // Calcula el cuadrado de la distancia entre dos puntos

source/director.cpp

@@ -91,6 +91,8 @@ void Director::iniOptions()
 	options->cheat.invincible = false;
 	options->cheat.jailEnabled = false;
 	options->cheat.altSkin = false;
+	options->rooms = 0;
+	options->items = 0;
 }
 
 // Comprueba los parametros del programa

source/game.cpp

@@ -92,6 +92,11 @@ void Game::checkEventHandler()
 			break;
 		}
 
+		if (eventHandler->type == SDL_RENDER_DEVICE_RESET || eventHandler->type == SDL_RENDER_TARGETS_RESET)
+		{
+			reLoadTextures();
+		}
+
 		if ((eventHandler->type == SDL_KEYDOWN) and (eventHandler->key.repeat == 0))
 		{
 			switch (eventHandler->key.keysym.scancode)
@@ -332,16 +337,18 @@ bool Game::changeRoom(std::string file)
 		setScoreBoardColor();
 
 		if (roomTracker->addRoom(file))
-		{ // Incrementa el contador de habitaciones visitadas
+		{
+			// Incrementa el contador de habitaciones visitadas
 			board.rooms++;
+			options->rooms = board.rooms;
+
+			// Actualiza las estadisticas
+			stats->addVisit(room->getName());
 		}
 
 		// Pasa la nueva habitación al jugador
 		player->setRoom(room);
 
-		// Actualiza las estadisticas
-		stats->addVisit(room->getName());
-
 		return true;
 	}
 

source/game_over.cpp

@@ -28,9 +28,9 @@ GameOver::GameOver(SDL_Renderer *renderer, Screen *screen, Resource *resource, A
     iniFade = 310;
     fadeLenght = 20;
     playerSprite->setPosX(GAMECANVAS_CENTER_X + 10);
-    playerSprite->setPosY(GAMECANVAS_CENTER_Y + 10);
+    playerSprite->setPosY(GAMECANVAS_CENTER_Y - 10);
     tvSprite->setPosX(GAMECANVAS_CENTER_X - tvSprite->getAnimationClip(0, 0).w - 10);
-    tvSprite->setPosY(GAMECANVAS_CENTER_Y + 10);
+    tvSprite->setPosY(GAMECANVAS_CENTER_Y - 10);
 
     // Inicializa el vector de colores
     const std::vector<std::string> colorList = {"white", "yellow", "cyan", "green", "magenta", "red", "blue", "black"};
@@ -86,12 +86,17 @@ void GameOver::render()
     screen->clean();
 
     // Escribe el texto de GAME OVER
-    text->writeDX(TXT_CENTER | TXT_COLOR, GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y - 20, "G A M E   O V E R", 1, color);
+    text->writeDX(TXT_CENTER | TXT_COLOR, GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y - 40, "G A M E   O V E R", 1, color);
 
     // Dibuja los sprites
     renderSprites();
 
-    // text->write(0, 0, std::to_string(counter));
+    // Escribe el texto con las habitaciones y los items
+    const std::string itemsTxt = std::to_string(options->items / 100) + std::to_string((options->items % 100) / 10) + std::to_string(options->items % 10);
+    const std::string roomsTxt = std::to_string(options->rooms / 100) + std::to_string((options->rooms % 100) / 10) + std::to_string(options->rooms % 10);
+    text->writeDX(TXT_CENTER | TXT_COLOR, GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y + 40, "ITEMS: " + itemsTxt, 1, color);
+    text->writeDX(TXT_CENTER | TXT_COLOR, GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y + 55, "ROOMS: " + roomsTxt, 1, color);
+
 
     // Vuelca el contenido del renderizador en pantalla
     screen->blit();

source/room.cpp

@@ -824,6 +824,7 @@ bool Room::itemCollision(SDL_Rect &rect)
             items.erase(items.begin() + i);
             JA_PlaySound(itemSound);
             *itemsPicked = *itemsPicked + 1;
+            options->items = *itemsPicked;
             return true;
         }
     }