From 2bf805b94177d9628ad68e3a61cfd45e0c311b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Sat, 15 Jun 2024 08:02:36 +0200
Subject: [PATCH] Commit de canvi d'equip

---
 .gitignore               | 1 +
 source/common/input.cpp  | 8 ++++++++
 source/common/input.h    | 1 +
 source/common/screen.cpp | 3 +++
 source/director.cpp      | 2 +-
 source/game.cpp          | 2 +-
 source/logo.h            | 1 -
 7 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93eed72..1004758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .vscode
+build/
 data/config/config.txt
 *.DS_Store
 thumbs.db
diff --git a/source/common/input.cpp b/source/common/input.cpp
index 25f325e..d633bb4 100644
--- a/source/common/input.cpp
+++ b/source/common/input.cpp
@@ -20,6 +20,14 @@ Input::Input(std::string file)
 
 	verbose = true;
 	enabled = true;
+
+	gameInputs.push_back(input_fire_left);
+	gameInputs.push_back(input_fire_center);
+	gameInputs.push_back(input_fire_right);
+	gameInputs.push_back(input_up);
+	gameInputs.push_back(input_down);
+	gameInputs.push_back(input_left);
+	gameInputs.push_back(input_right);
 }
 
 // Actualiza el estado del objeto
diff --git a/source/common/input.h b/source/common/input.h
index e4f02cd..923e77a 100644
--- a/source/common/input.h
+++ b/source/common/input.h
@@ -68,6 +68,7 @@ private:
 	std::vector<keyBindings_t> keyBindings;						  // Vector con las teclas asociadas a los inputs predefinidos
 	std::vector<GameControllerBindings_t> gameControllerBindings; // Vector con las teclas asociadas a los inputs predefinidos
 	std::vector<std::string> controllerNames;					  // Vector con los nombres de los mandos
+	std::vector<inputs_e> gameInputs;							  // Inputs usados para jugar, normalmente direcciones y botones
 	int numGamepads;											  // Numero de mandos conectados
 	std::string dbPath;											  // Ruta al archivo gamecontrollerdb.txt
 	bool verbose;												  // Indica si ha de mostrar mensajes
diff --git a/source/common/screen.cpp b/source/common/screen.cpp
index b6850e6..607abca 100644
--- a/source/common/screen.cpp
+++ b/source/common/screen.cpp
@@ -177,6 +177,9 @@ void Screen::setVideoMode(int videoMode)
     options->video.mode = videoMode;
     options->video.window.width = windowWidth;
     options->video.window.height = windowHeight;
+
+    // Recalcula los valores de los efectos
+    setShake();
 }
 
 // Camibia entre pantalla completa y ventana
diff --git a/source/director.cpp b/source/director.cpp
index 1d7aff5..6ee78d0 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -16,7 +16,7 @@ Director::Director(int argc, char *argv[])
 {
 	// Inicializa variables
 	section = new section_t();
-	section->name = SECTION_PROG_LOGO;
+	section->name = SECTION_PROG_TITLE;
 
 	// Inicializa las opciones del programa
 	initOptions();
diff --git a/source/game.cpp b/source/game.cpp
index 0438be4..f5bf94d 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -2725,7 +2725,7 @@ void Game::render()
 	screen->start();
 
 	// Limpia la pantalla
-	//screen->clean(bgColor);
+	screen->clean(bgColor);
 
 	SDL_RenderCopy(renderer, canvas, nullptr, &playArea);
 	scoreboard->render();
diff --git a/source/logo.h b/source/logo.h
index 5e140f2..5d3312a 100644
--- a/source/logo.h
+++ b/source/logo.h
@@ -26,7 +26,6 @@ private:
 	SDL_Event *eventHandler;	  // Manejador de eventos
 	std::vector<Sprite *> sprite; // Vector con los sprites de cada linea que forman el bitmap JAILGAMES
 	Sprite *sprite2;			  // Sprite para manejar la textura2
-	options_t *options;			  // Puntero a las opciones del juego
 	section_t *section;			  // Estado del bucle principal para saber si continua o se sale
 
 	// Variables