Añadido coffee_crisis.icns

.gitignore

@@ -1,6 +1,13 @@
 .vscode
+*config.txt
 *.DS_Store
-bin
+thumbs.db
-data/config/config.txt
+*.exe
-data/config/config.bin
+*_macos
-data/config/score.bin
+*_linux
+*.dmg
+*.tar.gz
+*.zip
+*.app
+*config.bin
+*score.bin

Makefile

@@ -1,18 +1,118 @@
 executable = coffee_crisis
+source = source/*.cpp source/common/*.cpp
+appName = Coffee Crisis
+releaseFolder = cc_release
+version = v2.1b
 
 windows:
 	@echo off
-	if not exist bin\ (mkdir bin)
+	powershell if (Test-Path data\config\config.bin) {Remove-Item data\config\config.bin -Recurse -Force}
-	g++ -std=c++11 -Wall -O2 source/*.cpp -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -o bin/$(executable).exe
+	powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force}
-	strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded
+	g++ $(source) -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
+
+windows_release:
+	@echo off
+
+# Remove data
+	powershell if (Test-Path data\config\config.bin) {Remove-Item data\config\config.bin -Recurse -Force}
+	powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force}
+	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+
+# Create folders
+	powershell if (-not (Test-Path $(releaseFolder))) {New-Item $(releaseFolder) -ItemType Directory}
+
+# Copy data
+	powershell Copy-Item -Path "data" -Destination "$(releaseFolder)" -recurse -Force
+	powershell Copy-Item "LICENSE" -Destination "$(releaseFolder)"
+	powershell Copy-Item "README.md" -Destination "$(releaseFolder)"
+	powershell Copy-Item "release/SDL2.dll" -Destination "$(releaseFolder)"
+
+# Build
+	g++ $(source) -D RELEASE -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
+	strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded
+
+# Create ZIP
+	powershell if (Test-Path $(executable)_win_$(version).zip) {Remove-Item $(executable)_win_$(version).zip}
+	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(executable)_win_$(version).zip
+
+# Remove folder
+	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+
 macos:
-	mkdir -p bin
+	rm -f data/config/config.bin
-	g++ source/*.cpp -std=c++11 -Wall -O2 -lSDL2 -o bin/$(executable)_macos
+	rm -f data/config/score.bin
+	clang++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos -target arm64-apple-macos11
+
+macos_release:
+# Remove data
+	rm -f data/config/config.bin
+	rm -f data/config/score.bin
+	rm -rdf "$(releaseFolder)"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/MacOS"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
+	mkdir -p Frameworks
+
+# Copy folders
+	cp -R data "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp -R /Library/Frameworks/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	cp -R /Library/Frameworks/SDL2.framework Frameworks
+
+# Copy files
+	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
+
+# Build INTEL
+	clang++ $(source) -D RELEASE -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
+
+# Build INTEL DMG
+	rm -f "$(executable)_macos_intel_$(version).dmg"
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_intel_$(version).dmg"
+	rm tmp.dmg
+
+# Build APPLE SILICON	
+	clang++ $(source) -D RELEASE -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 arm64-apple-macos11
+
+# Build APPLE SILICON DMG
+	rm -f "$(executable)_macos_apple_silicon_$(version).dmg"
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_apple_silicon_$(version).dmg"
+	rm tmp.dmg
+
+# Remove data
+	rm -rdf Frameworks
+	rm -rdf "$(releaseFolder)"
+
 linux:
-	mkdir -p bin
+	rm -f data/config/config.bin
-	g++ source/*.cpp -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+	rm -f data/config/score.bin
-	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded
+	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
-opendingux:
+	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
-	mkdir -p bin
+
-	/opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc -D GCWZERO -O2 -std=c++11 -I/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include/SDL2 -D_GNU_SOURCE=1 -D_REENTRANT -lSDL2 -lSDL2_mixer -lstdc++ source/*.cpp -o bin/$(executable)_opendingux
+linux_release:
-	/opt/gcw0-toolchain/usr/bin/mksquashfs ./default.gcw0.desktop ./icon.png ./bin ./data ./media coffee_crisis.opk -all-root -noappend -no-exports -no-xattrs
+# Remove data
+	rm -f data/config/config.bin
+	rm -f data/config/score.bin
+	rm -rdf $(releaseFolder)
+
+# Create folders
+	mkdir -p $(releaseFolder)
+
+# Copy data
+	cp -R data $(releaseFolder)
+	cp LICENSE $(releaseFolder)
+	cp README.md $(releaseFolder)
+
+# Build
+	g++ $(source) -D RELEASE -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable)
+	strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded
+
+# Pack files
+	cd $(releaseFolder) &&	tar -czvf ../$(executable)_linux_$(version).tar.gz *
+
+# Remove data
+	rm -rdf $(releaseFolder)

release/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>es</string>
+	<key>CFBundleDisplayName</key>
+	<string>coffee_crisis</string>
+	<key>CFBundleExecutable</key>
+	<string>coffee_crisis</string>
+	<key>CFBundleIconFile</key>
+	<string>coffee_crisis</string>
+	<key>CFBundleIconName</key>
+	<string>coffee_crisis</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.jailgames.coffee_crisis</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>coffee_crisis</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.12</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2022 JailDesigner</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>

source/balloon.cpp

@@ -2,7 +2,7 @@
 #include "balloon.h"
 
 // Constructor
-Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, LTexture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer)
+Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, Texture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer)
 {
 	sprite = new AnimatedSprite(texture, renderer, "", animation);
 	disable();

source/balloon.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils.h"
+#include "common/animatedsprite.h"
-#include "animatedsprite.h"
+#include "common/utils.h"
-#include <vector>
 #include <sstream>
+#include <vector>
 
 #ifndef BALLOON_H
 #define BALLOON_H
@@ -86,7 +86,7 @@ private:
 		std::vector<float> h; // Vector con los valores de zoom para el alto del globo
 	};
 
-	// Objetos
+	// Objetos y punteros
 	AnimatedSprite *sprite; // Sprite del objeto globo
 
 	// Variables
@@ -143,7 +143,7 @@ private:
 
 public:
 	// Constructor
-	Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, LTexture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer);
+	Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, Texture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer);
 
 	// Destructor
 	~Balloon();

source/bullet.cpp

@@ -2,7 +2,7 @@
 #include "bullet.h"
 
 // Constructor
-Bullet::Bullet(int x, int y, int kind, bool poweredUp, int owner, LTexture *texture, SDL_Renderer *renderer)
+Bullet::Bullet(int x, int y, int kind, bool poweredUp, int owner, Texture *texture, SDL_Renderer *renderer)
 {
 	sprite = new Sprite({x, y, 10, 10}, texture, renderer);
 

source/bullet.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils.h"
+#include "common/sprite.h"
-#include "sprite.h"
+#include "common/utils.h"
 
 #ifndef BULLET_H
 #define BULLET_H
@@ -20,7 +20,7 @@
 class Bullet
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	Sprite *sprite; // Sprite con los graficos y métodos de pintado
 
 	// Variables
@@ -39,7 +39,7 @@ private:
 
 public:
 	// Constructor
-	Bullet(int x, int y, int kind, bool poweredUp, int owner, LTexture *texture, SDL_Renderer *renderer);
+	Bullet(int x, int y, int kind, bool poweredUp, int owner, Texture *texture, SDL_Renderer *renderer);
 
 	// Destructor
 	~Bullet();

source/common/Makefile

@@ -0,0 +1,15 @@
+executable = jaildoctors_dilemma
+source = source/*.cpp source/common/*.cpp
+
+windows:
+	@echo off
+	if not exist bin\ (mkdir bin)
+	g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe
+	strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded
+macos:
+	mkdir -p bin
+	g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos
+linux:
+	mkdir -p bin
+	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded

source/common/animatedsprite.cpp

@@ -1,7 +1,7 @@
 #include "animatedsprite.h"
 
 // Constructor
-AnimatedSprite::AnimatedSprite(LTexture *texture, SDL_Renderer *renderer, std::string file, std::vector<std::string> *buffer)
+AnimatedSprite::AnimatedSprite(Texture *texture, SDL_Renderer *renderer, std::string file, std::vector<std::string> *buffer)
 {
 	// Copia los punteros
 	setTexture(texture);
@@ -88,6 +88,12 @@ void AnimatedSprite::animate()
 	}
 }
 
+// Obtiene el numero de frames de la animación actual
+int AnimatedSprite::getNumFrames()
+{
+	return (int)animation.at(currentAnimation).frames.size();
+}
+
 // Establece el frame actual de la animación
 void AnimatedSprite::setCurrentFrame(int num)
 {
@@ -304,7 +310,7 @@ bool AnimatedSprite::loadFromFile(std::string filePath)
 	}
 
 	// Pone un valor por defecto
-	setPos({0, 0, frameWidth, frameHeight});
+	setRect({0, 0, frameWidth, frameHeight});
 
 	return success;
 }
@@ -442,7 +448,7 @@ bool AnimatedSprite::loadFromVector(std::vector<std::string> *source)
 	}
 
 	// Pone un valor por defecto
-	setPos({0, 0, frameWidth, frameHeight});
+	setRect({0, 0, frameWidth, frameHeight});
 
 	return success;
 }

source/common/animatedsprite.h

@@ -2,11 +2,11 @@
 
 #include <SDL2/SDL.h>
 #include "movingsprite.h"
-#include <vector>
-#include <string>
-#include <sstream>
 #include <fstream>
 #include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #ifndef ANIMATEDSPRITE_H
 #define ANIMATEDSPRITE_H
@@ -25,12 +25,14 @@ private:
         int currentFrame;             // Frame actual
         int counter;                  // Contador para las animaciones
     };
+
+    // Variables
     std::vector<t_animation> animation; // Vector con las diferentes animaciones
     int currentAnimation;               // Animacion activa
 
 public:
     // Constructor
-    AnimatedSprite(LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr, std::string file = "", std::vector<std::string> *buffer = nullptr);
+    AnimatedSprite(Texture *texture = nullptr, SDL_Renderer *renderer = nullptr, std::string file = "", std::vector<std::string> *buffer = nullptr);
 
     // Destructor
     ~AnimatedSprite();
@@ -38,6 +40,9 @@ public:
     // Calcula el frame correspondiente a la animación actual
     void animate();
 
+    // Obtiene el numero de frames de la animación actual
+    int getNumFrames();
+
     // Establece el frame actual de la animación
     void setCurrentFrame(int num);
 

source/common/asset.cpp

@@ -1,10 +1,10 @@
 #include "asset.h"
 
 // Constructor
-Asset::Asset(std::string path)
+Asset::Asset(std::string executablePath)
 {
-    executablePath = path;
+    this->executablePath = executablePath.substr(0, executablePath.find_last_of("\\/"));
-    longest_name = 0;
+    longestName = 0;
 }
 
 // Destructor
@@ -13,7 +13,7 @@ Asset::~Asset()
 }
 
 // Añade un elemento a la lista
-void Asset::add(std::string file, enum assetType_e type, bool required)
+void Asset::add(std::string file, enum assetType type, bool required)
 {
     item_t temp;
     temp.file = executablePath + file;
@@ -22,7 +22,7 @@ void Asset::add(std::string file, enum assetType_e type, bool required)
     fileList.push_back(temp);
 
     const std::string filename = file.substr(file.find_last_of("\\/") + 1);
-    longest_name = SDL_max(longest_name, filename.size());
+    longestName = SDL_max(longestName, filename.size());
 }
 
 // Devuelve el fichero de un elemento de la lista a partir de una cadena
@@ -106,7 +106,7 @@ bool Asset::checkFile(std::string path)
         SDL_RWclose(file);
     }
 
-    const std::string s = "Checking file %-" + std::to_string(longest_name) + "s [" + result + "]\n";
+    const std::string s = "Checking file %-" + std::to_string(longestName) + "s [" + result + "]\n";
     printf(s.c_str(), filename.c_str());
 
     return success;

source/common/asset.h

@@ -7,7 +7,7 @@
 #ifndef ASSET_H
 #define ASSET_H
 
-enum assetType_e
+enum assetType
 {
 	t_bitmap,
 	t_music,
@@ -29,11 +29,11 @@ private:
 	struct item_t
 	{
 		std::string file;	 // Ruta del fichero desde la raiz del directorio
-		enum assetType_e type; // Indica el tipo de recurso
+		enum assetType type; // Indica el tipo de recurso
 		bool required;		 // Indica si es un fichero que debe de existir
 	};
 
-	int longest_name; // Contiene la longitud del nombre de fichero mas largo
+	int longestName; // Contiene la longitud del nombre de fichero mas largo
 
 	std::vector<item_t> fileList;
 	std::string executablePath;
@@ -46,13 +46,13 @@ private:
 
 public:
 	// Constructor
-	Asset(std::string path);
+	Asset(std::string executablePath);
 
 	// Destructor
 	~Asset();
 
 	// Añade un elemento a la lista
-	void add(std::string file, enum assetType_e type, bool required = true);
+	void add(std::string file, enum assetType type, bool required = true);
 
 	// Devuelve un elemento de la lista a partir de una cadena
 	std::string get(std::string text);

source/common/input.cpp

@@ -97,7 +97,7 @@ bool Input::checkInput(Uint8 input, bool repeat, int device, int index)
 		{
 			if (repeat)
 			{
-				if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings[input].button) != 0)
+				if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings.at(input).button) != 0)
 				{
 					successGameController = true;
 				}
@@ -108,11 +108,11 @@ bool Input::checkInput(Uint8 input, bool repeat, int device, int index)
 			}
 			else
 			{
-				if (!gameControllerBindings[input].active)
+				if (!gameControllerBindings.at(input).active)
 				{
-					if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings[input].button) != 0)
+					if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings.at(input).button) != 0)
 					{
-						gameControllerBindings[input].active = true;
+						gameControllerBindings.at(input).active = true;
 						successGameController = true;
 					}
 					else
@@ -122,9 +122,9 @@ bool Input::checkInput(Uint8 input, bool repeat, int device, int index)
 				}
 				else
 				{
-					if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings[input].button) == 0)
+					if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings.at(input).button) == 0)
 					{
-						gameControllerBindings[input].active = false;
+						gameControllerBindings.at(input).active = false;
 						successGameController = false;
 					}
 					else
@@ -138,6 +138,44 @@ bool Input::checkInput(Uint8 input, bool repeat, int device, int index)
 	return (successKeyboard || successGameController);
 }
 
+// Comprueba si hay almenos un input activo
+bool Input::checkAnyInput(int device, int index)
+{
+	if (device == INPUT_USE_ANY)
+	{
+		index = 0;
+	}
+
+	if (device == INPUT_USE_KEYBOARD || device == INPUT_USE_ANY)
+	{
+		const Uint8 *mKeystates = SDL_GetKeyboardState(nullptr);
+
+		for (int i = 0; i < (int)keyBindings.size(); ++i)
+		{
+			if (mKeystates[keyBindings.at(i).scancode] != 0)
+			{
+				return true;
+			}
+		}
+	}
+
+	if (gameControllerFound())
+	{
+		if (device == INPUT_USE_GAMECONTROLLER || device == INPUT_USE_ANY)
+		{
+			for (int i = 0; i < (int)gameControllerBindings.size(); ++i)
+			{
+				if (SDL_GameControllerGetButton(connectedControllers.at(index), gameControllerBindings.at(i).button) != 0)
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 // Comprueba si hay un mando conectado
 bool Input::discoverGameController()
 {

source/common/input.h

@@ -74,6 +74,9 @@ public:
 	// Comprueba si un input esta activo
 	bool checkInput(Uint8 input, bool repeat, int device = INPUT_USE_ANY, int index = 0);
 
+	// Comprueba si hay almenos un input activo
+	bool checkAnyInput(int device, int index);
+
 	// Comprueba si hay algun mando conectado
 	bool gameControllerFound();
 

source/common/menu.cpp

@@ -1,4 +1,3 @@
-#include "const.h"
 #include "menu.h"
 
 // Constructor
@@ -171,9 +170,6 @@ bool Menu::load(std::string file_path)
 		success = false;
 	}
 
-	// Reorganiza el menu con los valores recien cargados
-	// reorganize();
-
 	return success;
 }
 
@@ -211,6 +207,7 @@ bool Menu::setItem(item_t *item, std::string var, std::string value)
 	else if ((var == "") || (var == "[/item]"))
 	{
 	}
+	
 	else
 	{
 		success = false;
@@ -355,11 +352,6 @@ bool Menu::setVars(std::string var, std::string value)
 	return success;
 }
 
-// Inicializa las variables
-void Menu::init()
-{
-}
-
 // Carga los ficheros de audio
 void Menu::loadAudioFile(std::string file, int sound)
 {
@@ -412,7 +404,8 @@ void Menu::updateSelector()
 				selector.moving = false;
 			}
 		}
-		if (selector.despY < 0) // Va hacia arriba
+		
+		else if (selector.despY < 0) // Va hacia arriba
 		{
 			if (selector.y < selector.targetY) // Ha llegado al destino
 			{
@@ -440,7 +433,8 @@ void Menu::updateSelector()
 				selector.resizing = false;
 			}
 		}
-		if (selector.incH < 0) // Decrece
+		
+		else if (selector.incH < 0) // Decrece
 		{
 			if (selector.h < selector.targetH) // Ha llegado al destino
 			{
@@ -463,7 +457,7 @@ void Menu::setSelectorPos(int index)
 	if (index < (int)item.size())
 	{
 		selector.index = index;
-		selector.rect.y = selector.y = selector.originY = selector.targetY = item[selector.index].rect.y;
+		selector.rect.y = selector.y = selector.originY = selector.targetY = item.at(selector.index).rect.y;
 		selector.rect.w = rectBG.rect.w;
 		selector.rect.x = rectBG.rect.x;
 		selector.originH = selector.targetH = selector.rect.h = getSelectorHeight(selector.index);
@@ -491,13 +485,13 @@ void Menu::reset()
 {
 	itemSelected = MENU_NO_OPTION;
 	selector.index = 0;
-	selector.originY = selector.targetY = selector.y = item[0].rect.y;
+	selector.originY = selector.targetY = selector.y = item.at(0).rect.y;
-	selector.originH = selector.targetH = item[0].rect.h;
+	selector.originH = selector.targetH = item.at(0).rect.h;
 	selector.moving = false;
 	selector.resizing = false;
 
 	// Si el primer elemento no es seleccionable, incrementa el selector
-	if (!item[selector.index].selectable)
+	if (!item.at(selector.index).selectable)
 	{
 		increaseSelectorIndex();
 		setSelectorPos(selector.index);
@@ -529,18 +523,18 @@ void Menu::reorganize()
 bool Menu::increaseSelectorIndex()
 {
 	// Obten las coordenadas del elemento actual
-	selector.y = selector.originY = item[selector.index].rect.y;
+	selector.y = selector.originY = item.at(selector.index).rect.y;
 	selector.h = selector.originH = getSelectorHeight(selector.index);
 
 	// Calcula cual es el siguiente elemento
 	++selector.index %= item.size();
-	while (!item[selector.index].selectable)
+	while (!item.at(selector.index).selectable)
 	{
 		++selector.index %= item.size();
 	}
 
 	// Establece las coordenadas y altura de destino
-	selector.targetY = item[selector.index].rect.y;
+	selector.targetY = item.at(selector.index).rect.y;
 	selector.despY = (selector.targetY - selector.originY) / selector.numJumps;
 
 	selector.targetH = getSelectorHeight(selector.index);
@@ -559,7 +553,7 @@ bool Menu::increaseSelectorIndex()
 bool Menu::decreaseSelectorIndex()
 {
 	// Obten las coordenadas del elemento actual
-	selector.y = selector.originY = item[selector.index].rect.y;
+	selector.y = selector.originY = item.at(selector.index).rect.y;
 	selector.h = selector.originH = getSelectorHeight(selector.index);
 
 	// Calcula cual es el siguiente elemento
@@ -572,7 +566,7 @@ bool Menu::decreaseSelectorIndex()
 		selector.index--;
 	}
 
-	while (!item[selector.index].selectable)
+	while (!item.at(selector.index).selectable)
 	{
 		if (selector.index == 0)
 		{
@@ -585,7 +579,7 @@ bool Menu::decreaseSelectorIndex()
 	}
 
 	// Establece las coordenadas y altura de destino
-	selector.targetY = item[selector.index].rect.y;
+	selector.targetY = item.at(selector.index).rect.y;
 	selector.despY = (selector.targetY - selector.originY) / selector.numJumps;
 
 	selector.targetH = getSelectorHeight(selector.index);
@@ -635,28 +629,29 @@ void Menu::render()
 		if (i == selector.index)
 		{
 			const color_t color = {selector.itemColor.r, selector.itemColor.g, selector.itemColor.b};
-			text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, color);
+			text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, color);
 		}
 
-		else if (item[i].selectable)
+		else if (item.at(i).selectable)
 		{
-			text->write(item[i].rect.x, item[i].rect.y, item[i].label);
+			text->write(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label);
 		}
 
-		else if (item[i].greyed)
+		else if (item.at(i).greyed)
 		{
-			text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, colorGreyed);
+			text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, colorGreyed);
 		}
+		
 		else
 		{ // No seleccionable
-			if ((item[i].linkedUp) && (i == selector.index + 1))
+			if ((item.at(i).linkedUp) && (i == selector.index + 1))
 			{
 				const color_t color = {selector.itemColor.r, selector.itemColor.g, selector.itemColor.b};
-				text->writeColored(item[i].rect.x, item[i].rect.y, item[i].label, color);
+				text->writeColored(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label, color);
 			}
 			else // No enlazado con el de arriba
 			{
-				text->write(item[i].rect.x, item[i].rect.y, item[i].label);
+				text->write(item.at(i).rect.x, item.at(i).rect.y, item.at(i).label);
 			}
 		}
 	}
@@ -918,42 +913,42 @@ int Menu::findHeight()
 // Recoloca los elementos del menu en el eje Y
 void Menu::replaceElementsOnY()
 {
-	item[0].rect.y = y;
+	item.at(0).rect.y = y;
 
 	for (int i = 1; i < (int)item.size(); i++)
 	{
-		item[i].rect.y = item[i - 1].rect.y + item[i - 1].rect.h + item[i - 1].hPaddingDown;
+		item.at(i).rect.y = item.at(i - 1).rect.y + item.at(i - 1).rect.h + item.at(i - 1).hPaddingDown;
 	}
 }
 
 // Establece el estado seleccionable de un item
 void Menu::setSelectable(int index, bool value)
 {
-	item[index].selectable = value;
+	item.at(index).selectable = value;
 }
 
 // Establece el estado agrisado de un item
 void Menu::setGreyed(int index, bool value)
 {
-	item[index].greyed = value;
+	item.at(index).greyed = value;
 }
 
 // Establece el estado de enlace de un item
 void Menu::setLinkedDown(int index, bool value)
 {
-	item[index].linkedDown = value;
+	item.at(index).linkedDown = value;
 }
 
 // Calcula la altura del selector
 int Menu::getSelectorHeight(int value)
 {
-	if (item[value].linkedDown)
+	if (item.at(value).linkedDown)
 	{
-		return item[value].rect.h + item[value].hPaddingDown + item[value + 1].rect.h;
+		return item.at(value).rect.h + item.at(value).hPaddingDown + item.at(value + 1).rect.h;
 	}
 	else
 	{
-		return item[value].rect.h;
+		return item.at(value).rect.h;
 	}
 }
 

source/common/menu.h

@@ -1,15 +1,15 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include <vector>
-#include "sprite.h"
-#include "text.h"
 #include "asset.h"
 #include "input.h"
-#include "utils.h"
 #include "jail_audio.h"
-#include <sstream>
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include <fstream>
+#include <sstream>
+#include <vector>
 
 #ifndef MENU_H
 #define MENU_H
@@ -68,7 +68,7 @@ private:
 		int a;			   // Cantidad de transparencia para el rectangulo del selector
 	};
 
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer; // Puntero al renderizador de la ventana
 	Text *text;				// Texto para poder escribir los items del menu
 	Input *input;			// Gestor de eventos de entrada de teclado o gamepad
@@ -108,9 +108,6 @@ private:
 	// Asigna variables a partir de dos cadenas
 	bool setItem(item_t *item, std::string var, std::string value);
 
-	// Inicializa las variables
-	void init();
-
 	// Actualiza el menu para recolocarlo correctamente y establecer el tamaño
 	void reorganize();
 

source/common/movingsprite.cpp

@@ -1,8 +1,7 @@
-#include "const.h"
 #include "movingsprite.h"
 
 // Constructor
-MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, LTexture *texture, SDL_Renderer *renderer)
+MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, Texture *texture, SDL_Renderer *renderer)
 {
 	// Copia los punteros
 	this->texture = texture;
@@ -51,11 +50,6 @@ MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vel
 	currentFlip = SDL_FLIP_NONE;
 };
 
-// Destructor
-MovingSprite::~MovingSprite()
-{
-}
-
 // Reinicia todas las variables
 void MovingSprite::clear()
 {
@@ -160,11 +154,13 @@ double MovingSprite::getAngle()
 	return angle;
 }
 
-// Establece la posición del objeto
+// Establece la posición y el tamaño del objeto
-void MovingSprite::setPos(SDL_Rect rect)
+void MovingSprite::setRect(SDL_Rect rect)
 {
 	x = (float)rect.x;
 	y = (float)rect.y;
+	w = rect.w;
+	h = rect.h;
 }
 
 // Establece el valor de la variable
@@ -333,15 +329,6 @@ SDL_Rect MovingSprite::getRect()
 	return rect;
 }
 
-// Establece los valores de posición y tamaño del sprite
-void MovingSprite::setRect(SDL_Rect rect)
-{
-	x = (float)rect.x;
-	y = (float)rect.y;
-	w = rect.w;
-	h = rect.h;
-}
-
 // Deshace el último movimiento
 void MovingSprite::undoMove()
 {

source/common/movingsprite.h

@@ -35,10 +35,7 @@ protected:
 
 public:
     // Constructor
-    MovingSprite(float x = 0, float y = 0, int w = 0, int h = 0, float velx = 0, float vely = 0, float accelx = 0, float accely = 0, LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr);
+    MovingSprite(float x = 0, float y = 0, int w = 0, int h = 0, float velx = 0, float vely = 0, float accelx = 0, float accely = 0, Texture *texture = nullptr, SDL_Renderer *renderer = nullptr);
-
-    // Destructor
-    ~MovingSprite();
 
     // Mueve el sprite
     void move();
@@ -88,8 +85,8 @@ public:
     // Obtiene el valor de la variable
     Uint16 getRotateSpeed();
 
-    // Establece la posición del objeto
+    // Establece la posición y el tamaño del objeto
-    void setPos(SDL_Rect rect);
+    void setRect(SDL_Rect rect);
 
     // Establece el valor de la variable
     void setPosX(float value);
@@ -151,9 +148,6 @@ public:
     // Devuelve el rectangulo donde está el sprite
     SDL_Rect getRect();
 
-    // Establece los valores de posición y tamaño del sprite
-    void setRect(SDL_Rect rect);
-
     // Deshace el último movimiento
     void undoMove();
 

source/common/screen.cpp

@@ -21,7 +21,7 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options, i
 
     // Crea la textura donde se dibujan los graficos del juego
     gameCanvas = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, gameCanvasWidth, gameCanvasHeight);
-    if (gameCanvas == NULL)
+    if (gameCanvas == nullptr)
     {
         printf("TitleSurface could not be created!\nSDL Error: %s\n", SDL_GetError());
     }
@@ -61,14 +61,14 @@ void Screen::start()
 void Screen::blit()
 {
     // Vuelve a dejar el renderizador en modo normal
-    SDL_SetRenderTarget(renderer, NULL);
+    SDL_SetRenderTarget(renderer, nullptr);
 
     // Borra el contenido previo
     SDL_SetRenderDrawColor(renderer, borderColor.r, borderColor.g, borderColor.b, 0xFF);
     SDL_RenderClear(renderer);
 
     // Copia la textura de juego en el renderizador en la posición adecuada
-    SDL_RenderCopy(renderer, gameCanvas, NULL, &dest);
+    SDL_RenderCopy(renderer, gameCanvas, nullptr, &dest);
 
     // Muestra por pantalla el renderizador
     SDL_RenderPresent(renderer);

source/common/smartsprite.cpp

@@ -1,8 +1,7 @@
-#include "const.h"
 #include "smartsprite.h"
 
 // Constructor
-SmartSprite::SmartSprite(LTexture *texture, SDL_Renderer *renderer)
+SmartSprite::SmartSprite(Texture *texture, SDL_Renderer *renderer)
 {
 	// Copia punteros
 	setTexture(texture);
@@ -12,11 +11,6 @@ SmartSprite::SmartSprite(LTexture *texture, SDL_Renderer *renderer)
 	init();
 }
 
-// Destructor
-SmartSprite::~SmartSprite()
-{
-}
-
 // Inicializa el objeto
 void SmartSprite::init()
 {

source/common/smartsprite.h

@@ -12,7 +12,7 @@
 class SmartSprite : public AnimatedSprite
 {
 private:
-	// VAriables
+	// Variables
 	bool enabled;		// Indica si esta habilitado
 	bool onDestination; // Indica si está en el destino
 	int destX;			// Posicion de destino en el eje X
@@ -28,10 +28,7 @@ private:
 
 public:
 	// Constructor
-	SmartSprite(LTexture *texture, SDL_Renderer *renderer);
+	SmartSprite(Texture *texture, SDL_Renderer *renderer);
-
-	// Destructor
-	~SmartSprite();
 
 	// Inicializa el objeto
 	void init();

source/common/sprite.cpp

@@ -1,7 +1,7 @@
 #include "sprite.h"
 
 // Constructor
-Sprite::Sprite(int x, int y, int w, int h, LTexture *texture, SDL_Renderer *renderer)
+Sprite::Sprite(int x, int y, int w, int h, Texture *texture, SDL_Renderer *renderer)
 {
 	// Establece la posición X,Y del sprite
 	this->x = x;
@@ -24,7 +24,7 @@ Sprite::Sprite(int x, int y, int w, int h, LTexture *texture, SDL_Renderer *rend
 	enabled = true;
 }
 
-Sprite::Sprite(SDL_Rect rect, LTexture *texture, SDL_Renderer *renderer)
+Sprite::Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer)
 {
 	// Establece la posición X,Y del sprite
 	x = rect.x;
@@ -137,13 +137,13 @@ void Sprite::setSpriteClip(int x, int y, int w, int h)
 }
 
 // Obten el valor de la variable
-LTexture *Sprite::getTexture()
+Texture *Sprite::getTexture()
 {
 	return texture;
 }
 
 // Establece el valor de la variable
-void Sprite::setTexture(LTexture *texture)
+void Sprite::setTexture(Texture *texture)
 {
 	this->texture = texture;
 }

source/common/sprite.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "ltexture.h"
+#include "texture.h"
 
 #ifndef SPRITE_H
 #define SPRITE_H
@@ -16,15 +16,15 @@ protected:
     int h; // Alto del sprite
 
     SDL_Renderer *renderer; // Puntero al renderizador de la ventana
-    LTexture *texture;      // Textura donde estan todos los dibujos del sprite
+    Texture *texture;      // Textura donde estan todos los dibujos del sprite
     SDL_Rect spriteClip;    // Rectangulo de origen de la textura que se dibujará en pantalla
 
     bool enabled; // Indica si el sprite esta habilitado
 
 public:
     // Constructor
-    Sprite(int x = 0, int y = 0, int w = 0, int h = 0, LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr);
+    Sprite(int x = 0, int y = 0, int w = 0, int h = 0, Texture *texture = nullptr, SDL_Renderer *renderer = nullptr);
-    Sprite(SDL_Rect rect, LTexture *texture, SDL_Renderer *renderer);
+    Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer);
 
     // Destructor
     ~Sprite();
@@ -69,10 +69,10 @@ public:
     void setSpriteClip(int x, int y, int w, int h);
 
     // Obten el valor de la variable
-    LTexture *getTexture();
+    Texture *getTexture();
 
     // Establece el valor de la variable
-    void setTexture(LTexture *texture);
+    void setTexture(Texture *texture);
 
     // Obten el valor de la variable
     SDL_Renderer *getRenderer();

source/common/text.cpp

@@ -10,7 +10,7 @@ Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer)
 	initOffsetFromFile(textFile);
 
 	// Crea los objetos
-	texture = new LTexture(renderer, bitmapFile);
+	texture = new Texture(renderer, bitmapFile);
 	sprite = new Sprite({0, 0, boxWidth, boxHeight}, texture, renderer);
 }
 
@@ -143,7 +143,9 @@ void Text::initOffsetFromFile(std::string file)
 		{
 			// Almacena solo las lineas impares
 			if (line_read % 2 == 1)
+			{
 				offset[index++].w = std::stoi(buffer);
+			}
 
 			// Limpia el buffer
 			buffer.clear();

source/common/text.h

@@ -22,9 +22,9 @@ private:
 		int w;
 	};
 	
-	// Objetos
+	// Objetos y punteros
 	Sprite *sprite; // Objeto con los graficos para el texto
-	LTexture *texture; // Textura con los bitmaps del texto
+	Texture *texture; // Textura con los bitmaps del texto
 
 	// Variables
 	int boxWidth;	   // Anchura de la caja de cada caracter en el png

source/common/texture.cpp

@@ -1,10 +1,10 @@
 
-#include "ltexture.h"
+#include "texture.h"
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 
 // Constructor
-LTexture::LTexture(SDL_Renderer *renderer, std::string path)
+Texture::Texture(SDL_Renderer *renderer, std::string path)
 {
 	// Copia punteros
 	this->renderer = renderer;
@@ -23,14 +23,14 @@ LTexture::LTexture(SDL_Renderer *renderer, std::string path)
 }
 
 // Destructor
-LTexture::~LTexture()
+Texture::~Texture()
 {
 	// Libera memoria
 	unload();
 }
 
 // Carga una imagen desde un fichero
-bool LTexture::loadFromFile(std::string path, SDL_Renderer *renderer)
+bool Texture::loadFromFile(std::string path, SDL_Renderer *renderer)
 {
     const std::string filename = path.substr(path.find_last_of("\\/") + 1);
 	int req_format = STBI_rgb_alpha;
@@ -98,7 +98,7 @@ bool LTexture::loadFromFile(std::string path, SDL_Renderer *renderer)
 }
 
 // Crea una textura en blanco
-bool LTexture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_TextureAccess access)
+bool Texture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_TextureAccess access)
 {
 	// Crea una textura sin inicializar
 	texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, access, width, height);
@@ -116,7 +116,7 @@ bool LTexture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_Te
 }
 
 // Libera la memoria de la textura
-void LTexture::unload()
+void Texture::unload()
 {
 	// Libera la textura si existe
 	if (texture != nullptr)
@@ -129,25 +129,25 @@ void LTexture::unload()
 }
 
 // Establece el color para la modulacion
-void LTexture::setColor(Uint8 red, Uint8 green, Uint8 blue)
+void Texture::setColor(Uint8 red, Uint8 green, Uint8 blue)
 {
 	SDL_SetTextureColorMod(texture, red, green, blue);
 }
 
 // Establece el blending
-void LTexture::setBlendMode(SDL_BlendMode blending)
+void Texture::setBlendMode(SDL_BlendMode blending)
 {
 	SDL_SetTextureBlendMode(texture, blending);
 }
 
 // Establece el alpha para la modulación
-void LTexture::setAlpha(Uint8 alpha)
+void Texture::setAlpha(Uint8 alpha)
 {
 	SDL_SetTextureAlphaMod(texture, alpha);
 }
 
 // Renderiza la textura en un punto específico
-void LTexture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, float zoomW, float zoomH, double angle, SDL_Point *center, SDL_RendererFlip flip)
+void Texture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, float zoomW, float zoomH, double angle, SDL_Point *center, SDL_RendererFlip flip)
 {
 	// Establece el destino de renderizado en la pantalla
 	SDL_Rect renderQuad = {x, y, width, height};
@@ -167,25 +167,25 @@ void LTexture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, floa
 }
 
 // Establece la textura como objetivo de renderizado
-void LTexture::setAsRenderTarget(SDL_Renderer *renderer)
+void Texture::setAsRenderTarget(SDL_Renderer *renderer)
 {
 	SDL_SetRenderTarget(renderer, texture);
 }
 
 // Obtiene el ancho de la imagen
-int LTexture::getWidth()
+int Texture::getWidth()
 {
 	return width;
 }
 
 // Obtiene el alto de la imagen
-int LTexture::getHeight()
+int Texture::getHeight()
 {
 	return height;
 }
 
 // Recarga la textura
-bool LTexture::reLoad()
+bool Texture::reLoad()
 {
 	return loadFromFile(path, renderer);
 }

source/common/texture.h

@@ -4,25 +4,27 @@
 #include <stdio.h>
 #include <string>
 
-#ifndef LTEXTURE_H
+#ifndef TEXTURE_H
-#define LTEXTURE_H
+#define TEXTURE_H
 
-// Clase LTexture
+class Texture
-class LTexture
 {
 private:
+    // Objetos y punteros
     SDL_Texture *texture;   // La textura
     SDL_Renderer *renderer; // Renderizador donde dibujar la textura
-    int width;              // Ancho de la imagen
+
-    int height;             // Alto de la imagen
+    // Variables
-    std::string path;       // Ruta de la imagen de la textura
+    int width;        // Ancho de la imagen
+    int height;       // Alto de la imagen
+    std::string path; // Ruta de la imagen de la textura
 
 public:
     // Constructor
-    LTexture(SDL_Renderer *renderer, std::string path = "");
+    Texture(SDL_Renderer *renderer, std::string path = "");
 
     // Destructor
-    ~LTexture();
+    ~Texture();
 
     // Carga una imagen desde un fichero
     bool loadFromFile(std::string path, SDL_Renderer *renderer);

source/common/utils.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "ltexture.h"
+#include "texture.h"
 #include <string>
 #include <vector>
 

source/common/writer.cpp

@@ -1,4 +1,3 @@
-#include "const.h"
 #include "writer.h"
 
 // Constructor
@@ -22,11 +21,6 @@ Writer::Writer(Text *text)
 	finished = false;
 }
 
-// Destructor
-Writer::~Writer()
-{
-}
-
 // Actualiza el objeto
 void Writer::update()
 {

source/common/writer.h

@@ -11,7 +11,7 @@
 class Writer
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	Text *text; // Objeto encargado de escribir el texto
 
 	// Variables
@@ -32,9 +32,6 @@ public:
 	// Constructor
 	Writer(Text *text);
 
-	// Destructor
-	~Writer();
-
 	// Actualiza el objeto
 	void update();
 

source/const.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils.h"
+#include "common/utils.h"
 #include "lang.h"
 
 #ifndef CONST_H

source/director.cpp

@@ -1,6 +1,6 @@
 #include "const.h"
 #include "director.h"
-#include "utils.h"
+#include "common/utils.h"
 #include <iostream>
 #include <string>
 
@@ -11,7 +11,7 @@ Director::Director(std::string path)
 	section.name = PROG_SECTION_LOGO;
 
 	// Crea el objeto que controla los ficheros de recursos
-	asset = new Asset(path.substr(0, path.find_last_of("\\/")) + "/../");
+	asset = new Asset(path);
 
 	// Establece la lista de ficheros
 	if (!setFileList())
@@ -160,122 +160,128 @@ bool Director::initSDL()
 // Crea el indice de ficheros
 bool Director::setFileList()
 {
+#ifdef MACOS_BUNDLE
+	const std::string prefix = "/../Resources";
+#else
+	const std::string prefix = "";
+#endif
+
 	// Ficheros de configuración
-	asset->add("data/config/score.bin", t_data, false);
+	asset->add(prefix + "/data/config/score.bin", t_data, false);
-	asset->add("data/config/demo.bin", t_data);
+	asset->add(prefix + "/data/config/demo.bin", t_data);
-	asset->add("data/config/config.bin", t_data, false);
+	asset->add(prefix + "/data/config/config.bin", t_data, false);
-	asset->add("data/config/gamecontrollerdb.txt", t_data);
+	asset->add(prefix + "/data/config/gamecontrollerdb.txt", t_data);
 
 	// Musicas
-	asset->add("data/music/intro.ogg", t_music);
+	asset->add(prefix + "/data/music/intro.ogg", t_music);
-	asset->add("data/music/playing.ogg", t_music);
+	asset->add(prefix + "/data/music/playing.ogg", t_music);
-	asset->add("data/music/title.ogg", t_music);
+	asset->add(prefix + "/data/music/title.ogg", t_music);
 
 	// Sonidos
-	asset->add("data/sound/balloon.wav", t_sound);
+	asset->add(prefix + "/data/sound/balloon.wav", t_sound);
-	asset->add("data/sound/bubble1.wav", t_sound);
+	asset->add(prefix + "/data/sound/bubble1.wav", t_sound);
-	asset->add("data/sound/bubble2.wav", t_sound);
+	asset->add(prefix + "/data/sound/bubble2.wav", t_sound);
-	asset->add("data/sound/bubble3.wav", t_sound);
+	asset->add(prefix + "/data/sound/bubble3.wav", t_sound);
-	asset->add("data/sound/bubble4.wav", t_sound);
+	asset->add(prefix + "/data/sound/bubble4.wav", t_sound);
-	asset->add("data/sound/bullet.wav", t_sound);
+	asset->add(prefix + "/data/sound/bullet.wav", t_sound);
-	asset->add("data/sound/coffeeout.wav", t_sound);
+	asset->add(prefix + "/data/sound/coffeeout.wav", t_sound);
-	asset->add("data/sound/hiscore.wav", t_sound);
+	asset->add(prefix + "/data/sound/hiscore.wav", t_sound);
-	asset->add("data/sound/itemdrop.wav", t_sound);
+	asset->add(prefix + "/data/sound/itemdrop.wav", t_sound);
-	asset->add("data/sound/itempickup.wav", t_sound);
+	asset->add(prefix + "/data/sound/itempickup.wav", t_sound);
-	asset->add("data/sound/menu_move.wav", t_sound);
+	asset->add(prefix + "/data/sound/menu_move.wav", t_sound);
-	asset->add("data/sound/menu_select.wav", t_sound);
+	asset->add(prefix + "/data/sound/menu_select.wav", t_sound);
-	asset->add("data/sound/player_collision.wav", t_sound);
+	asset->add(prefix + "/data/sound/player_collision.wav", t_sound);
-	asset->add("data/sound/stage_change.wav", t_sound);
+	asset->add(prefix + "/data/sound/stage_change.wav", t_sound);
-	asset->add("data/sound/title.wav", t_sound);
+	asset->add(prefix + "/data/sound/title.wav", t_sound);
-	asset->add("data/sound/clock.wav", t_sound);
+	asset->add(prefix + "/data/sound/clock.wav", t_sound);
-	asset->add("data/sound/powerball.wav", t_sound);
+	asset->add(prefix + "/data/sound/powerball.wav", t_sound);
 
 	// Texturas
-	asset->add("data/gfx/balloon1.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/balloon1.png", t_bitmap);
-	asset->add("data/gfx/balloon1.ani", t_data);
+	asset->add(prefix + "/data/gfx/balloon1.ani", t_data);
-	asset->add("data/gfx/balloon2.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/balloon2.png", t_bitmap);
-	asset->add("data/gfx/balloon2.ani", t_data);
+	asset->add(prefix + "/data/gfx/balloon2.ani", t_data);
-	asset->add("data/gfx/balloon3.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/balloon3.png", t_bitmap);
-	asset->add("data/gfx/balloon3.ani", t_data);
+	asset->add(prefix + "/data/gfx/balloon3.ani", t_data);
-	asset->add("data/gfx/balloon4.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/balloon4.png", t_bitmap);
-	asset->add("data/gfx/balloon4.ani", t_data);
+	asset->add(prefix + "/data/gfx/balloon4.ani", t_data);
-	asset->add("data/gfx/bullet.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/bullet.png", t_bitmap);
 
-	asset->add("data/gfx/game_buildings.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_buildings.png", t_bitmap);
-	asset->add("data/gfx/game_clouds.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_clouds.png", t_bitmap);
-	asset->add("data/gfx/game_grass.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_grass.png", t_bitmap);
-	asset->add("data/gfx/game_power_meter.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_power_meter.png", t_bitmap);
-	asset->add("data/gfx/game_sky_colors.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_sky_colors.png", t_bitmap);
-	asset->add("data/gfx/game_text.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/game_text.png", t_bitmap);
 
-	asset->add("data/gfx/intro.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/intro.png", t_bitmap);
-	asset->add("data/gfx/logo.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/logo.png", t_bitmap);
-	asset->add("data/gfx/menu_game_over.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/menu_game_over.png", t_bitmap);
-	asset->add("data/gfx/menu_game_over_end.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/menu_game_over_end.png", t_bitmap);
 
-	asset->add("data/gfx/item_points1_disk.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_points1_disk.png", t_bitmap);
-	asset->add("data/gfx/item_points1_disk.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_points1_disk.ani", t_data);
-	asset->add("data/gfx/item_points2_gavina.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_points2_gavina.png", t_bitmap);
-	asset->add("data/gfx/item_points2_gavina.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_points2_gavina.ani", t_data);
-	asset->add("data/gfx/item_points3_pacmar.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_points3_pacmar.png", t_bitmap);
-	asset->add("data/gfx/item_points3_pacmar.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_points3_pacmar.ani", t_data);
-	asset->add("data/gfx/item_clock.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_clock.png", t_bitmap);
-	asset->add("data/gfx/item_clock.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_clock.ani", t_data);
-	asset->add("data/gfx/item_coffee.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_coffee.png", t_bitmap);
-	asset->add("data/gfx/item_coffee.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_coffee.ani", t_data);
-	asset->add("data/gfx/item_coffee_machine.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/item_coffee_machine.png", t_bitmap);
-	asset->add("data/gfx/item_coffee_machine.ani", t_data);
+	asset->add(prefix + "/data/gfx/item_coffee_machine.ani", t_data);
 
-	asset->add("data/gfx/title_bg_tile.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/title_bg_tile.png", t_bitmap);
-	asset->add("data/gfx/title_coffee.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/title_coffee.png", t_bitmap);
-	asset->add("data/gfx/title_crisis.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/title_crisis.png", t_bitmap);
-	asset->add("data/gfx/title_dust.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/title_dust.png", t_bitmap);
-	asset->add("data/gfx/title_dust.ani", t_data);
+	asset->add(prefix + "/data/gfx/title_dust.ani", t_data);
-	asset->add("data/gfx/title_gradient.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/title_gradient.png", t_bitmap);
 
-	asset->add("data/gfx/player_head.ani", t_data);
+	asset->add(prefix + "/data/gfx/player_head.ani", t_data);
-	asset->add("data/gfx/player_body.ani", t_data);
+	asset->add(prefix + "/data/gfx/player_body.ani", t_data);
-	asset->add("data/gfx/player_legs.ani", t_data);
+	asset->add(prefix + "/data/gfx/player_legs.ani", t_data);
-	asset->add("data/gfx/player_death.ani", t_data);
+	asset->add(prefix + "/data/gfx/player_death.ani", t_data);
-	asset->add("data/gfx/player_fire.ani", t_data);
+	asset->add(prefix + "/data/gfx/player_fire.ani", t_data);
 
-	asset->add("data/gfx/player_bal1_head.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_bal1_head.png", t_bitmap);
-	asset->add("data/gfx/player_bal1_body.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_bal1_body.png", t_bitmap);
-	asset->add("data/gfx/player_bal1_legs.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_bal1_legs.png", t_bitmap);
-	asset->add("data/gfx/player_bal1_death.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_bal1_death.png", t_bitmap);
-	asset->add("data/gfx/player_bal1_fire.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_bal1_fire.png", t_bitmap);
 
-	asset->add("data/gfx/player_arounder_head.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_arounder_head.png", t_bitmap);
-	asset->add("data/gfx/player_arounder_body.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_arounder_body.png", t_bitmap);
-	asset->add("data/gfx/player_arounder_legs.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_arounder_legs.png", t_bitmap);
-	asset->add("data/gfx/player_arounder_death.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_arounder_death.png", t_bitmap);
-	asset->add("data/gfx/player_arounder_fire.png", t_bitmap);
+	asset->add(prefix + "/data/gfx/player_arounder_fire.png", t_bitmap);
 
 	// Fuentes
-	asset->add("data/font/8bithud.png", t_font);
+	asset->add(prefix + "/data/font/8bithud.png", t_font);
-	asset->add("data/font/8bithud.txt", t_font);
+	asset->add(prefix + "/data/font/8bithud.txt", t_font);
-	asset->add("data/font/nokia.png", t_font);
+	asset->add(prefix + "/data/font/nokia.png", t_font);
-	asset->add("data/font/nokia_big2.png", t_font);
+	asset->add(prefix + "/data/font/nokia_big2.png", t_font);
-	asset->add("data/font/nokia.txt", t_font);
+	asset->add(prefix + "/data/font/nokia.txt", t_font);
-	asset->add("data/font/nokia2.png", t_font);
+	asset->add(prefix + "/data/font/nokia2.png", t_font);
-	asset->add("data/font/nokia2.txt", t_font);
+	asset->add(prefix + "/data/font/nokia2.txt", t_font);
-	asset->add("data/font/nokia_big2.txt", t_font);
+	asset->add(prefix + "/data/font/nokia_big2.txt", t_font);
-	asset->add("data/font/smb2_big.png", t_font);
+	asset->add(prefix + "/data/font/smb2_big.png", t_font);
-	asset->add("data/font/smb2_big.txt", t_font);
+	asset->add(prefix + "/data/font/smb2_big.txt", t_font);
-	asset->add("data/font/smb2.png", t_font);
+	asset->add(prefix + "/data/font/smb2.png", t_font);
-	asset->add("data/font/smb2.txt", t_font);
+	asset->add(prefix + "/data/font/smb2.txt", t_font);
 
 	// Textos
-	asset->add("data/lang/es_ES.txt", t_lang);
+	asset->add(prefix + "/data/lang/es_ES.txt", t_lang);
-	asset->add("data/lang/en_UK.txt", t_lang);
+	asset->add(prefix + "/data/lang/en_UK.txt", t_lang);
-	asset->add("data/lang/ba_BA.txt", t_lang);
+	asset->add(prefix + "/data/lang/ba_BA.txt", t_lang);
 
 	// Menus
-	asset->add("data/menu/title.men", t_data);
+	asset->add(prefix + "/data/menu/title.men", t_data);
-	asset->add("data/menu/options.men", t_data);
+	asset->add(prefix + "/data/menu/options.men", t_data);
-	asset->add("data/menu/pause.men", t_data);
+	asset->add(prefix + "/data/menu/pause.men", t_data);
-	asset->add("data/menu/gameover.men", t_data);
+	asset->add(prefix + "/data/menu/gameover.men", t_data);
-	asset->add("data/menu/player_select.men", t_data);
+	asset->add(prefix + "/data/menu/player_select.men", t_data);
 
 	return asset->check();
 }

source/director.h

@@ -1,27 +1,27 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
 #include "balloon.h"
 #include "bullet.h"
+#include "common/asset.h"
+#include "common/input.h"
+#include "common/jail_audio.h"
+#include "common/menu.h"
+#include "common/movingsprite.h"
+#include "common/screen.h"
+#include "common/smartsprite.h"
+#include "common/sprite.h"
+#include "common/text.h"
+#include "common/utils.h"
+#include "common/writer.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"
-#include "input.h"
 #include "intro.h"
 #include "item.h"
-#include "jail_audio.h"
 #include "logo.h"
-#include "menu.h"
-#include "movingsprite.h"
 #include "player.h"
-#include "screen.h"
-#include "smartsprite.h"
-#include "sprite.h"
-#include "text.h"
 #include "title.h"
-#include "utils.h"
-#include "writer.h"
 
 #ifndef DIRECTOR_H
 #define DIRECTOR_H
@@ -29,11 +29,10 @@
 // Textos
 #define WINDOW_CAPTION "Coffee Crisis"
 
-// Clase Director
 class Director
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	SDL_Window *window;		   // La ventana donde dibujamos
 	SDL_Renderer *renderer;	   // El renderizador de la ventana
 	Screen *screen;			   // Objeto encargado de dibujar en pantalla

source/fade.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "ltexture.h"
+#include "common/texture.h"
 
 #ifndef FADE_H
 #define FADE_H

source/game.cpp

@@ -273,6 +273,8 @@ void Game::init()
 	powerBallEnabled = false;
 	powerBallCounter = 0;
 	coffeeMachineEnabled = false;
+	pauseCounter = 0;
+	leavingPauseMenu = false;
 
 	if (demo.enabled)
 	{
@@ -389,80 +391,80 @@ void Game::loadMedia()
 	loadDemoFile();
 
 	// Texturas
-	bulletTexture = new LTexture(renderer, asset->get("bullet.png"));
+	bulletTexture = new Texture(renderer, asset->get("bullet.png"));
-	gameBuildingsTexture = new LTexture(renderer, asset->get("game_buildings.png"));
+	gameBuildingsTexture = new Texture(renderer, asset->get("game_buildings.png"));
-	gameCloudsTexture = new LTexture(renderer, asset->get("game_clouds.png"));
+	gameCloudsTexture = new Texture(renderer, asset->get("game_clouds.png"));
-	gameGrassTexture = new LTexture(renderer, asset->get("game_grass.png"));
+	gameGrassTexture = new Texture(renderer, asset->get("game_grass.png"));
-	gamePowerMeterTexture = new LTexture(renderer, asset->get("game_power_meter.png"));
+	gamePowerMeterTexture = new Texture(renderer, asset->get("game_power_meter.png"));
-	gameSkyColorsTexture = new LTexture(renderer, asset->get("game_sky_colors.png"));
+	gameSkyColorsTexture = new Texture(renderer, asset->get("game_sky_colors.png"));
-	gameTextTexture = new LTexture(renderer, asset->get("game_text.png"));
+	gameTextTexture = new Texture(renderer, asset->get("game_text.png"));
-	gameOverTexture = new LTexture(renderer, asset->get("menu_game_over.png"));
+	gameOverTexture = new Texture(renderer, asset->get("menu_game_over.png"));
-	gameOverEndTexture = new LTexture(renderer, asset->get("menu_game_over_end.png"));
+	gameOverEndTexture = new Texture(renderer, asset->get("menu_game_over_end.png"));
 
 	// Texturas - Globos
-	LTexture *balloon1Texture = new LTexture(renderer, asset->get("balloon1.png"));
+	Texture *balloon1Texture = new Texture(renderer, asset->get("balloon1.png"));
 	balloonTextures.push_back(balloon1Texture);
 
-	LTexture *balloon2Texture = new LTexture(renderer, asset->get("balloon2.png"));
+	Texture *balloon2Texture = new Texture(renderer, asset->get("balloon2.png"));
 	balloonTextures.push_back(balloon2Texture);
 
-	LTexture *balloon3Texture = new LTexture(renderer, asset->get("balloon3.png"));
+	Texture *balloon3Texture = new Texture(renderer, asset->get("balloon3.png"));
 	balloonTextures.push_back(balloon3Texture);
 
-	LTexture *balloon4Texture = new LTexture(renderer, asset->get("balloon4.png"));
+	Texture *balloon4Texture = new Texture(renderer, asset->get("balloon4.png"));
 	balloonTextures.push_back(balloon4Texture);
 
 	// Texturas - Items
-	LTexture *item1 = new LTexture(renderer, asset->get("item_points1_disk.png"));
+	Texture *item1 = new Texture(renderer, asset->get("item_points1_disk.png"));
 	itemTextures.push_back(item1);
 
-	LTexture *item2 = new LTexture(renderer, asset->get("item_points2_gavina.png"));
+	Texture *item2 = new Texture(renderer, asset->get("item_points2_gavina.png"));
 	itemTextures.push_back(item2);
 
-	LTexture *item3 = new LTexture(renderer, asset->get("item_points3_pacmar.png"));
+	Texture *item3 = new Texture(renderer, asset->get("item_points3_pacmar.png"));
 	itemTextures.push_back(item3);
 
-	LTexture *item4 = new LTexture(renderer, asset->get("item_clock.png"));
+	Texture *item4 = new Texture(renderer, asset->get("item_clock.png"));
 	itemTextures.push_back(item4);
 
-	LTexture *item5 = new LTexture(renderer, asset->get("item_coffee.png"));
+	Texture *item5 = new Texture(renderer, asset->get("item_coffee.png"));
 	itemTextures.push_back(item5);
 
-	LTexture *item6 = new LTexture(renderer, asset->get("item_coffee_machine.png"));
+	Texture *item6 = new Texture(renderer, asset->get("item_coffee_machine.png"));
 	itemTextures.push_back(item6);
 
 	// Texturas - Player1
-	LTexture *player1Head = new LTexture(renderer, asset->get("player_bal1_head.png"));
+	Texture *player1Head = new Texture(renderer, asset->get("player_bal1_head.png"));
 	player1Textures.push_back(player1Head);
 
-	LTexture *player1Body = new LTexture(renderer, asset->get("player_bal1_body.png"));
+	Texture *player1Body = new Texture(renderer, asset->get("player_bal1_body.png"));
 	player1Textures.push_back(player1Body);
 
-	LTexture *player1Legs = new LTexture(renderer, asset->get("player_bal1_legs.png"));
+	Texture *player1Legs = new Texture(renderer, asset->get("player_bal1_legs.png"));
 	player1Textures.push_back(player1Legs);
 
-	LTexture *player1Death = new LTexture(renderer, asset->get("player_bal1_death.png"));
+	Texture *player1Death = new Texture(renderer, asset->get("player_bal1_death.png"));
 	player1Textures.push_back(player1Death);
 
-	LTexture *player1Fire = new LTexture(renderer, asset->get("player_bal1_fire.png"));
+	Texture *player1Fire = new Texture(renderer, asset->get("player_bal1_fire.png"));
 	player1Textures.push_back(player1Fire);
 
 	playerTextures.push_back(player1Textures);
 
 	// Texturas - Player2
-	LTexture *player2Head = new LTexture(renderer, asset->get("player_arounder_head.png"));
+	Texture *player2Head = new Texture(renderer, asset->get("player_arounder_head.png"));
 	player2Textures.push_back(player2Head);
 
-	LTexture *player2Body = new LTexture(renderer, asset->get("player_arounder_body.png"));
+	Texture *player2Body = new Texture(renderer, asset->get("player_arounder_body.png"));
 	player2Textures.push_back(player2Body);
 
-	LTexture *player2Legs = new LTexture(renderer, asset->get("player_arounder_legs.png"));
+	Texture *player2Legs = new Texture(renderer, asset->get("player_arounder_legs.png"));
 	player2Textures.push_back(player2Legs);
 
-	LTexture *player2Death = new LTexture(renderer, asset->get("player_arounder_death.png"));
+	Texture *player2Death = new Texture(renderer, asset->get("player_arounder_death.png"));
 	player2Textures.push_back(player2Death);
 
-	LTexture *player2Fire = new LTexture(renderer, asset->get("player_arounder_fire.png"));
+	Texture *player2Fire = new Texture(renderer, asset->get("player_arounder_fire.png"));
 	player2Textures.push_back(player2Fire);
 
 	playerTextures.push_back(player2Textures);
@@ -3073,11 +3075,6 @@ void Game::checkGameInput()
 				if (input->checkInput(INPUT_CANCEL, REPEAT_FALSE, options->input[i].deviceType, options->input[i].id))
 				{
 					section.subsection = GAME_SECTION_PAUSE;
-
-					if (JA_GetMusicState() == JA_MUSIC_PLAYING)
-					{
-						JA_PauseMusic();
-					}
 				}
 
 				if (demo.counter < TOTAL_DEMO_DATA)
@@ -3289,41 +3286,61 @@ void Game::updatePausedGame()
 		// Actualiza el contador de ticks
 		ticks = SDL_GetTicks();
 
-		// Actualiza la lógica del menu de pausa
+		if (leavingPauseMenu)
-		pauseMenu->update();
-
-		// Comprueba las entradas para el menu
-		pauseMenu->checkInput();
-
-		// Comprueba si se ha seleccionado algún item del menú
-		switch (pauseMenu->getItemSelected())
 		{
-		case 1:
+			if (pauseCounter > 0)
-			section.name = PROG_SECTION_GAME;
+			{ // El contador está descendiendo
-			section.subsection = numPlayers == 1 ? GAME_SECTION_PLAY_1P : GAME_SECTION_PLAY_2P;
+				const bool a = pauseCounter == 90;
-
+				const bool b = pauseCounter == 60;
-			if (JA_GetMusicState() == JA_MUSIC_PAUSED)
+				const bool c = pauseCounter == 30;
-			{
+				if (a || b || c)
-				JA_ResumeMusic();
+				{
+					JA_PlaySound(clockSound);
+				}
+				pauseCounter--;
 			}
-			break;
+			else
+			{ // Ha finalizado el contador
+				section.name = PROG_SECTION_GAME;
+				section.subsection = numPlayers == 1 ? GAME_SECTION_PLAY_1P : GAME_SECTION_PLAY_2P;
 
-		case 2:
+				if (JA_GetMusicState() == JA_MUSIC_PAUSED)
-			fade->setFadeType(FADE_CENTER);
+				{
-			fade->activateFade();
+					JA_ResumeMusic();
-			break;
+				}
-
+			}
-		default:
-			break;
 		}
+		else
+		{ // Actualiza la lógica del menu de pausa
+			pauseMenu->update();
 
-		// Actualiza el fade
+			// Comprueba las entradas para el menu
-		fade->update();
+			pauseMenu->checkInput();
-		if (fade->hasEnded())
+
-		{
+			// Comprueba si se ha seleccionado algún item del menú
-			section.name = PROG_SECTION_TITLE;
+			switch (pauseMenu->getItemSelected())
-			section.subsection = TITLE_SECTION_1;
+			{
-			JA_StopMusic();
+			case 1:
+				leavingPauseMenu = true;
+				break;
+
+			case 2:
+				fade->setFadeType(FADE_CENTER);
+				fade->activateFade();
+				break;
+
+			default:
+				break;
+			}
+
+			// Actualiza el fade
+			fade->update();
+			if (fade->hasEnded())
+			{
+				section.name = PROG_SECTION_TITLE;
+				section.subsection = TITLE_SECTION_1;
+				JA_StopMusic();
+			}
 		}
 	}
 }
@@ -3361,7 +3378,14 @@ void Game::renderPausedGame()
 		renderFlashEffect();
 	}
 
-	pauseMenu->render();
+	if (leavingPauseMenu)
+	{
+		textNokiaBig2->writeCentered(SCREEN_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, std::to_string((pauseCounter / 30) + 1));
+	}
+	else
+	{
+		pauseMenu->render();
+	}
 	fade->render();
 
 	// Vuelca el contenido del renderizador en pantalla
@@ -3371,8 +3395,18 @@ void Game::renderPausedGame()
 // Bucle para el menu de pausa del juego
 void Game::runPausedGame()
 {
+	// Pone en pausa la música
+	if (JA_GetMusicState() == JA_MUSIC_PLAYING)
+	{
+		JA_PauseMusic();
+	}
+
 	// Reinicia el menu
 	pauseMenu->reset();
+	leavingPauseMenu = false;
+
+	// Inicializa variables
+	pauseCounter = 90;
 
 	while ((section.subsection == GAME_SECTION_PAUSE) && (section.name == PROG_SECTION_GAME))
 	{
@@ -3715,6 +3749,15 @@ void Game::checkEventHandler()
 			section.name = PROG_SECTION_QUIT;
 			break;
 		}
+
+		else if (eventHandler->type == SDL_WINDOWEVENT)
+		{
+			if (eventHandler->window.event == SDL_WINDOWEVENT_FOCUS_LOST)
+			{
+				section.subsection = GAME_SECTION_PAUSE;
+			}
+		}
+
 		else if (eventHandler->type == SDL_KEYDOWN && eventHandler->key.repeat == 0)
 		{
 			switch (eventHandler->key.keysym.scancode)

source/game.h

@@ -1,23 +1,23 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
 #include "balloon.h"
 #include "bullet.h"
+#include "common/asset.h"
+#include "common/input.h"
+#include "common/jail_audio.h"
+#include "common/menu.h"
+#include "common/movingsprite.h"
+#include "common/screen.h"
+#include "common/smartsprite.h"
+#include "common/sprite.h"
+#include "common/text.h"
+#include "common/utils.h"
+#include "common/writer.h"
 #include "const.h"
 #include "fade.h"
-#include "input.h"
 #include "item.h"
-#include "jail_audio.h"
-#include "menu.h"
-#include "movingsprite.h"
 #include "player.h"
-#include "screen.h"
-#include "smartsprite.h"
-#include "sprite.h"
-#include "text.h"
-#include "utils.h"
-#include "writer.h"
 #include <iostream>
 
 #ifndef GAME_H
@@ -114,7 +114,7 @@ private:
 		demoKeys_t dataFile[TOTAL_DEMO_DATA]; // Datos del fichero con los movimientos para la demo
 	};
 
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer; // El renderizador de la ventana
 	Screen *screen;			// Objeto encargado de dibujar en pantalla
 	Asset *asset;			// Objeto que gestiona todos los ficheros de recursos
@@ -127,21 +127,21 @@ private:
 	std::vector<Item *> items;				 // Vector con los items
 	std::vector<SmartSprite *> smartSprites; // Vector con los smartsprites
 
-	LTexture *bulletTexture;							 // Textura para las balas
+	Texture *bulletTexture;							 // Textura para las balas
-	std::vector<LTexture *> itemTextures;				 // Vector con las texturas de los items
+	std::vector<Texture *> itemTextures;				 // Vector con las texturas de los items
-	std::vector<LTexture *> balloonTextures;			 // Vector con las texturas de los globos
+	std::vector<Texture *> balloonTextures;			 // Vector con las texturas de los globos
-	std::vector<LTexture *> player1Textures;			 // Vector con las texturas del jugador
+	std::vector<Texture *> player1Textures;			 // Vector con las texturas del jugador
-	std::vector<LTexture *> player2Textures;			 // Vector con las texturas del jugador
+	std::vector<Texture *> player2Textures;			 // Vector con las texturas del jugador
-	std::vector<std::vector<LTexture *>> playerTextures; // Vector con todas las texturas de los jugadores;
+	std::vector<std::vector<Texture *>> playerTextures; // Vector con todas las texturas de los jugadores;
 
-	LTexture *gameBuildingsTexture;	 // Textura con los edificios de fondo
+	Texture *gameBuildingsTexture;	 // Textura con los edificios de fondo
-	LTexture *gameCloudsTexture;	 // Textura con las nubes de fondo
+	Texture *gameCloudsTexture;	 // Textura con las nubes de fondo
-	LTexture *gameGrassTexture;		 // Textura con la hierba del suelo
+	Texture *gameGrassTexture;		 // Textura con la hierba del suelo
-	LTexture *gamePowerMeterTexture; // Textura con el marcador de poder de la fase
+	Texture *gamePowerMeterTexture; // Textura con el marcador de poder de la fase
-	LTexture *gameSkyColorsTexture;	 // Textura con los diferentes colores de fondo del juego
+	Texture *gameSkyColorsTexture;	 // Textura con los diferentes colores de fondo del juego
-	LTexture *gameTextTexture;		 // Textura para los sprites con textos
+	Texture *gameTextTexture;		 // Textura para los sprites con textos
-	LTexture *gameOverTexture;		 // Textura para la pantalla de game over
+	Texture *gameOverTexture;		 // Textura para la pantalla de game over
-	LTexture *gameOverEndTexture;	 // Textura para la pantalla de game over de acabar el juego
+	Texture *gameOverEndTexture;	 // Textura para la pantalla de game over de acabar el juego
 
 	std::vector<std::vector<std::string> *> itemAnimations;	   // Vector con las animaciones de los items
 	std::vector<std::vector<std::string> *> playerAnimations;  // Vector con las animaciones del jugador
@@ -193,10 +193,9 @@ private:
 	JA_Music gameMusic; // Musica de fondo
 
 	// Variables
-	int numPlayers;	  // Numero de jugadores
+	int numPlayers;												 // Numero de jugadores
-	Uint32 ticks;	  // Contador de ticks para ajustar la velocidad del programa
+	Uint32 ticks;												 // Contador de ticks para ajustar la velocidad del programa
-	Uint8 ticksSpeed; // Velocidad a la que se repiten los bucles del programa
+	Uint8 ticksSpeed;											 // Velocidad a la que se repiten los bucles del programa
-
 	Uint32 hiScore;												 // Puntuación máxima
 	bool hiScoreAchieved;										 // Indica si se ha superado la puntuación máxima
 	section_t section;											 // Seccion actual dentro del juego
@@ -236,6 +235,8 @@ private:
 	demo_t demo;												 // Variable con todas las variables relacionadas con el modo demo
 	int totalPowerToCompleteGame;								 // La suma del poder necesario para completar todas las fases
 	int cloudsSpeed;											 // Velocidad a la que se desplazan las nubes
+	int pauseCounter;											 // Contador para salir del menu de pausa y volver al juego
+	bool leavingPauseMenu;										 // Indica si esta saliendo del menu de pausa para volver al juego
 
 	// Actualiza el juego
 	void update();

source/instructions.cpp

@@ -12,22 +12,22 @@ Instructions::Instructions(SDL_Renderer *renderer, Screen *screen, Asset *asset,
 	this->lang = lang;
 
 	// Reserva memoria para los punteros
-	LTexture *item1 = new LTexture(renderer, asset->get("item_points1_disk.png"));
+	Texture *item1 = new Texture(renderer, asset->get("item_points1_disk.png"));
 	itemTextures.push_back(item1);
 
-	LTexture *item2 = new LTexture(renderer, asset->get("item_points2_gavina.png"));
+	Texture *item2 = new Texture(renderer, asset->get("item_points2_gavina.png"));
 	itemTextures.push_back(item2);
 
-	LTexture *item3 = new LTexture(renderer, asset->get("item_points3_pacmar.png"));
+	Texture *item3 = new Texture(renderer, asset->get("item_points3_pacmar.png"));
 	itemTextures.push_back(item3);
 
-	LTexture *item4 = new LTexture(renderer, asset->get("item_clock.png"));
+	Texture *item4 = new Texture(renderer, asset->get("item_clock.png"));
 	itemTextures.push_back(item4);
 
-	LTexture *item5 = new LTexture(renderer, asset->get("item_coffee.png"));
+	Texture *item5 = new Texture(renderer, asset->get("item_coffee.png"));
 	itemTextures.push_back(item5);
 
-	LTexture *item6 = new LTexture(renderer, asset->get("item_coffee_machine.png"));
+	Texture *item6 = new Texture(renderer, asset->get("item_coffee_machine.png"));
 	itemTextures.push_back(item6);
 
 	eventHandler = new SDL_Event();

source/instructions.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
+#include "common/asset.h"
+#include "common/jail_audio.h"
+#include "common/screen.h"
+#include "common/sprite.h"
+#include "common/text.h"
+#include "common/utils.h"
 #include "const.h"
-#include "jail_audio.h"
-#include "screen.h"
-#include "sprite.h"
-#include "text.h"
-#include "utils.h"
 
 #ifndef INSTRUCTIONS_H
 #define INSTRUCTIONS_H
@@ -22,10 +22,10 @@ enum mode_e
 class Instructions
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer;				  // El renderizador de la ventana
 	Screen *screen;						  // Objeto encargado de dibujar en pantalla
-	std::vector<LTexture *> itemTextures; // Vector con las texturas de los items
+	std::vector<Texture *> itemTextures; // Vector con las texturas de los items
 	SDL_Event *eventHandler;			  // Manejador de eventos
 	SDL_Texture *backbuffer;			  // Textura para usar como backbuffer
 	Sprite *sprite;						  // Sprite con la textura de las instrucciones

source/intro.cpp

@@ -11,7 +11,7 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
 
 	// Reserva memoria para los objetos
 	eventHandler = new SDL_Event();
-	texture = new LTexture(renderer, asset->get("intro.png"));
+	texture = new Texture(renderer, asset->get("intro.png"));
 	text = new Text(asset->get("nokia.png"), asset->get("nokia.txt"), renderer);
 
 	// Carga los recursos

source/intro.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
+#include "common/asset.h"
+#include "common/jail_audio.h"
+#include "common/screen.h"
+#include "common/smartsprite.h"
+#include "common/utils.h"
+#include "common/writer.h"
 #include "const.h"
-#include "jail_audio.h"
-#include "screen.h"
-#include "smartsprite.h"
-#include "utils.h"
-#include "writer.h"
 #include <vector>
 
 #ifndef INTRO_H
@@ -17,10 +17,10 @@
 class Intro
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer;				// El renderizador de la ventana
 	Screen *screen;						// Objeto encargado de dibujar en pantalla
-	LTexture *texture;					// Textura con los graficos
+	Texture *texture;					// Textura con los graficos
 	SDL_Event *eventHandler;			// Manejador de eventos
 	Asset *asset;						// Objeto que gestiona todos los ficheros de recursos
 	Lang *lang;							// Objeto para gestionar los textos en diferentes idiomas

source/item.cpp

@@ -2,7 +2,7 @@
 #include "item.h"
 
 // Constructor
-Item::Item(Uint8 kind, float x, float y, LTexture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer)
+Item::Item(Uint8 kind, float x, float y, Texture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer)
 {
 	sprite = new AnimatedSprite(texture, renderer, "", animation);
 

source/item.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils.h"
+#include "common/utils.h"
 
 #ifndef ITEM_H
 #define ITEM_H
@@ -19,7 +19,7 @@
 class Item
 {
 private:
-    // Objetos
+    // Objetos y punteros
     AnimatedSprite *sprite; // Sprite con los graficos del objeto
 
     // Variables
@@ -45,7 +45,7 @@ public:
     Uint16 timeToLive; // Temporizador con el tiempo que el objeto está presente
 
     // Constructor
-    Item(Uint8 kind, float x, float y, LTexture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer);
+    Item(Uint8 kind, float x, float y, Texture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer);
 
     // Destructor
     ~Item();

source/lang.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
+#include "common/asset.h"
 #include <string>
 
 #ifndef LANG_H

source/logo.cpp

@@ -13,7 +13,7 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset)
 
 	// Reserva memoria para los punteros
 	eventHandler = new SDL_Event();
-	texture = new LTexture(renderer, asset->get("logo.png"));
+	texture = new Texture(renderer, asset->get("logo.png"));
 	sprite = new Sprite(14, 75, 226, 44, texture, renderer);
 
 	// Inicializa variables

source/logo.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
+#include "common/asset.h"
+#include "common/jail_audio.h"
+#include "common/screen.h"
+#include "common/sprite.h"
+#include "common/utils.h"
 #include "const.h"
-#include "jail_audio.h"
-#include "screen.h"
-#include "sprite.h"
-#include "utils.h"
 
 #ifndef LOGO_H
 #define LOGO_H
@@ -15,11 +15,11 @@
 class Logo
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer;	 // El renderizador de la ventana
 	Screen *screen;			 // Objeto encargado de dibujar en pantalla
 	Asset *asset;			 // Objeto que gestiona todos los ficheros de recursos
-	LTexture *texture;		 // Textura con los graficos
+	Texture *texture;		 // Textura con los graficos
 	SDL_Event *eventHandler; // Manejador de eventos
 	Sprite *sprite;			 // Sprite con la textura del logo
 

source/player.cpp

@@ -2,7 +2,7 @@
 #include "player.h"
 
 // Constructor
-Player::Player(float x, int y, SDL_Renderer *renderer, std::vector<LTexture *> texture, std::vector<std::vector<std::string> *> animations)
+Player::Player(float x, int y, SDL_Renderer *renderer, std::vector<Texture *> texture, std::vector<std::vector<std::string> *> animations)
 {
 	// Copia los punteros
 	this->renderer = renderer;
@@ -578,7 +578,7 @@ void Player::shiftColliders()
 }
 
 // Obtiene el puntero a la textura con los gráficos de la animación de morir
-LTexture *Player::getDeadTexture()
+Texture *Player::getDeadTexture()
 {
 	return deathSprite->getTexture();
 	;
@@ -617,7 +617,7 @@ void Player::updatePowerUpHeadOffset()
 }
 
 // Pone las texturas del jugador
-void Player::setPlayerTextures(std::vector<LTexture *> texture)
+void Player::setPlayerTextures(std::vector<Texture *> texture)
 {
 	headSprite->setTexture(texture.at(0));
 	bodySprite->setTexture(texture.at(1));

source/player.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils.h"
+#include "common/animatedsprite.h"
-#include "input.h"
+#include "common/asset.h"
-#include "asset.h"
+#include "common/input.h"
-#include "ltexture.h"
+#include "common/texture.h"
-#include "animatedsprite.h"
+#include "common/utils.h"
 
 #ifndef PLAYER_H
 #define PLAYER_H
@@ -31,7 +31,7 @@
 class Player
 {
 private:
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer;		 // El renderizador de la ventana
 	AnimatedSprite *headSprite;	 // Sprite para dibujar la cabeza
 	AnimatedSprite *bodySprite;	 // Sprite para dibujar el cuerpo
@@ -83,7 +83,7 @@ private:
 
 public:
 	// Constructor
-	Player(float x, int y, SDL_Renderer *renderer, std::vector<LTexture *> texture, std::vector<std::vector<std::string> *> animations);
+	Player(float x, int y, SDL_Renderer *renderer, std::vector<Texture *> texture, std::vector<std::vector<std::string> *> animations);
 
 	// Destructor
 	~Player();
@@ -98,7 +98,7 @@ public:
 	void render();
 
 	// Pone las texturas del jugador
-	void setPlayerTextures(std::vector<LTexture *> texture);
+	void setPlayerTextures(std::vector<Texture *> texture);
 
 	// Actua en consecuencia de la entrada recibida
 	void setInput(Uint8 input);
@@ -212,7 +212,7 @@ public:
 	circle_t &getCollider();
 
 	// Obtiene el puntero a la textura con los gráficos de la animación de morir
-	LTexture *getDeadTexture();
+	Texture *getDeadTexture();
 
 	// Obtiene el valor de la variable
 	Uint16 getDeathCounter();

source/title.cpp

@@ -17,10 +17,10 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset,
 	eventHandler = new SDL_Event();
 	fade = new Fade(renderer);
 
-	dustTexture = new LTexture(renderer, asset->get("title_dust.png"));
+	dustTexture = new Texture(renderer, asset->get("title_dust.png"));
-	coffeeTexture = new LTexture(renderer, asset->get("title_coffee.png"));
+	coffeeTexture = new Texture(renderer, asset->get("title_coffee.png"));
-	crisisTexture = new LTexture(renderer, asset->get("title_crisis.png"));
+	crisisTexture = new Texture(renderer, asset->get("title_crisis.png"));
-	gradientTexture = new LTexture(renderer, asset->get("title_gradient.png"));
+	gradientTexture = new Texture(renderer, asset->get("title_gradient.png"));
 
 	coffeeBitmap = new SmartSprite(coffeeTexture, renderer);
 	crisisBitmap = new SmartSprite(crisisTexture, renderer);
@@ -1030,7 +1030,7 @@ void Title::createTiledBackground()
 	}
 
 	// Crea los objetos para pintar en la textura de fondo
-	LTexture *bgTileTexture = new LTexture(renderer, asset->get("title_bg_tile.png"));
+	Texture *bgTileTexture = new Texture(renderer, asset->get("title_bg_tile.png"));
 	Sprite *tile = new Sprite({0, 0, 64, 64}, bgTileTexture, renderer);
 
 	// Prepara para dibujar sobre la textura

source/title.h

@@ -1,27 +1,27 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "asset.h"
+#include "common/asset.h"
+#include "common/input.h"
+#include "common/jail_audio.h"
+#include "common/menu.h"
+#include "common/movingsprite.h"
+#include "common/screen.h"
+#include "common/smartsprite.h"
+#include "common/sprite.h"
+#include "common/text.h"
+#include "common/utils.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"
-#include "input.h"
 #include "instructions.h"
 #include "item.h"
-#include "jail_audio.h"
-#include "menu.h"
-#include "movingsprite.h"
-#include "screen.h"
-#include "smartsprite.h"
-#include "sprite.h"
-#include "text.h"
-#include "utils.h"
 
 #ifndef TITLE_H
 #define TITLE_H
 
 // Textos
-#define TEXT_COPYRIGHT "@2020,2022 JailDesigner (v2.1)"
+#define TEXT_COPYRIGHT "@2020,2022 JailDesigner (v2.1b)"
 
 // Contadores
 #define TITLE_COUNTER 800
@@ -29,7 +29,6 @@
 // Cantidad de eventos de la pantalla de titulo
 #define TITLE_TOTAL_EVENTS 2
 
-// Clase Title
 class Title
 {
 private:
@@ -42,7 +41,7 @@ private:
 		bool keyPressed;	// Variable para evitar la repetición de teclas en los menus
 	};
 
-	// Objetos
+	// Objetos y punteros
 	SDL_Renderer *renderer;		// El renderizador de la ventana
 	Screen *screen;				// Objeto encargado de dibujar en pantalla
 	Asset *asset;				// Objeto que gestiona todos los ficheros de recursos
@@ -52,10 +51,10 @@ private:
 	Game *demoGame;				// Objeto para lanzar la demo del juego
 	SDL_Event *eventHandler;	// Manejador de eventos
 
-	LTexture *dustTexture;	   // Textura con los graficos del polvo
+	Texture *dustTexture;	   // Textura con los graficos del polvo
-	LTexture *coffeeTexture;   // Textura con los graficos de la palabra coffee
+	Texture *coffeeTexture;   // Textura con los graficos de la palabra coffee
-	LTexture *crisisTexture;   // Textura con los graficos de la plabra crisis
+	Texture *crisisTexture;   // Textura con los graficos de la plabra crisis
-	LTexture *gradientTexture; // Textura con los graficos para el degradado del fondo del titulo
+	Texture *gradientTexture; // Textura con los graficos para el degradado del fondo del titulo
 
 	SDL_Rect backgroundWindow; // Ventana visible para la textura de fondo del titulo
 	SDL_Texture *background;   // Textura dibujar el fondo del titulo