diff --git a/source/const.h b/source/const.h index d7ccd17..55ddc3a 100644 --- a/source/const.h +++ b/source/const.h @@ -2,7 +2,7 @@ #include #include -#include "utils\utils.h" +#include "utils/utils.h" #ifndef CONST_H #define CONST_H diff --git a/source/credits.h b/source/credits.h index b5ffd22..9ffee40 100644 --- a/source/credits.h +++ b/source/credits.h @@ -2,12 +2,12 @@ #include #include "const.h" -#include "utils\asset.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/text.h" +#include "utils/utils.h" #include #ifndef CREDITS_H @@ -31,8 +31,8 @@ private: Text *text; // Objeto para escribir texto en pantalla int counter; // Contador section_t section; // Estado del bucle principal para saber si continua o se sale - Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa - Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa + Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa + Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa std::vector texts; // Vector con las letras de la marquesina SDL_Texture *textTexture; // Textura para dibujar el texto diff --git a/source/director.cpp b/source/director.cpp index 0ce35ed..2c22284 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -1,5 +1,5 @@ #include "director.h" -#include "utils\utils.h" +#include "utils/utils.h" #include #include diff --git a/source/director.h b/source/director.h index 48847cf..fd65df3 100644 --- a/source/director.h +++ b/source/director.h @@ -6,14 +6,14 @@ #include "intro.h" #include "logo.h" #include "title.h" -#include "utils\asset.h" -#include "utils\debug.h" -#include "utils\input.h" -#include "utils\jail_audio.h" -#include "utils\movingsprite.h" -#include "utils\sprite.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/debug.h" +#include "utils/input.h" +#include "utils/jail_audio.h" +#include "utils/movingsprite.h" +#include "utils/sprite.h" +#include "utils/text.h" +#include "utils/utils.h" #ifndef DIRECTOR_H #define DIRECTOR_H diff --git a/source/enemy.h b/source/enemy.h index 25bf8f5..2078d39 100644 --- a/source/enemy.h +++ b/source/enemy.h @@ -1,8 +1,8 @@ #pragma once #include -#include "utils\animatedsprite.h" -#include "utils\asset.h" -#include "utils\utils.h" +#include "utils/animatedsprite.h" +#include "utils/asset.h" +#include "utils/utils.h" #include #ifndef ENEMY_H diff --git a/source/game.cpp b/source/game.cpp index ba61360..b2cd5cc 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -24,7 +24,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D // currentRoom = "06.room"; // spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; - currentRoom = "57.room"; + currentRoom = "55.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; diff --git a/source/game.h b/source/game.h index 8bcabf3..24908c2 100644 --- a/source/game.h +++ b/source/game.h @@ -8,15 +8,15 @@ #include "room.h" #include "scoreboard.h" #include "test.h" -#include "utils\animatedsprite.h" -#include "utils\asset.h" -#include "utils\debug.h" -#include "utils\input.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/animatedsprite.h" +#include "utils/asset.h" +#include "utils/debug.h" +#include "utils/input.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/text.h" +#include "utils/utils.h" #ifndef GAME_H #define GAME_H @@ -38,8 +38,8 @@ private: ScoreBoard *scoreboard; // Objeto encargado de gestionar el marcador JA_Music music; // Musica que suena durante el juego Debug *debug; // Objeto para gestionar la información de debug - Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa - Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa + Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa + Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa section_t section; // Seccion actual dentro del juego std::string currentRoom; // Fichero de la habitación actual player_t spawnPoint; // Lugar de la habitación donde aparece el jugador @@ -100,7 +100,7 @@ private: // Dibuja la pantalla negra void renderBlackScreen(); - + public: // Constructor Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, Debug *debug); diff --git a/source/intro.h b/source/intro.h index d81af82..da2a0b2 100644 --- a/source/intro.h +++ b/source/intro.h @@ -2,15 +2,15 @@ #include #include "const.h" -#include "utils\asset.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/utils.h" #include #include -#include "utils\text.h" +#include "utils/text.h" #ifndef INTRO_H #define INTRO_H diff --git a/source/item.h b/source/item.h index 7d86698..90d72ee 100644 --- a/source/item.h +++ b/source/item.h @@ -1,9 +1,9 @@ #pragma once #include -#include "utils\asset.h" -#include "utils\sprite.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/sprite.h" +#include "utils/utils.h" #include #ifndef ITEM_H diff --git a/source/item_tracker.h b/source/item_tracker.h index 6b6dfde..7843b16 100644 --- a/source/item_tracker.h +++ b/source/item_tracker.h @@ -1,6 +1,6 @@ #pragma once #include -#include "utils\utils.h" +#include "utils/utils.h" #include #include diff --git a/source/logo.h b/source/logo.h index 6646bd8..de02c88 100644 --- a/source/logo.h +++ b/source/logo.h @@ -2,11 +2,11 @@ #include #include "const.h" -#include "utils\asset.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/utils.h" #include #ifndef LOGO_H diff --git a/source/player.h b/source/player.h index b0f9c52..763f8b8 100644 --- a/source/player.h +++ b/source/player.h @@ -3,11 +3,11 @@ #include #include "const.h" #include "room.h" -#include "utils\animatedsprite.h" -#include "utils\asset.h" -#include "utils\debug.h" -#include "utils\input.h" -#include "utils\utils.h" +#include "utils/animatedsprite.h" +#include "utils/asset.h" +#include "utils/debug.h" +#include "utils/input.h" +#include "utils/utils.h" #include #include diff --git a/source/room.h b/source/room.h index eb0cd68..64522d5 100644 --- a/source/room.h +++ b/source/room.h @@ -5,12 +5,12 @@ #include "enemy.h" #include "item_tracker.h" #include "item.h" -#include "utils\asset.h" -#include "utils\debug.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/debug.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/utils.h" #include #include diff --git a/source/room_tracker.h b/source/room_tracker.h index 664164a..6685124 100644 --- a/source/room_tracker.h +++ b/source/room_tracker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "utils\utils.h" +#include "utils/utils.h" #include #include diff --git a/source/scoreboard.h b/source/scoreboard.h index 69a8f3e..be698d7 100644 --- a/source/scoreboard.h +++ b/source/scoreboard.h @@ -2,10 +2,10 @@ #include #include "const.h" -#include "utils\animatedsprite.h" -#include "utils\asset.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/animatedsprite.h" +#include "utils/asset.h" +#include "utils/text.h" +#include "utils/utils.h" #include #ifndef SCOREBOARD_H diff --git a/source/test.h b/source/test.h index e54e105..a92297d 100644 --- a/source/test.h +++ b/source/test.h @@ -2,11 +2,11 @@ #include #include "const.h" -#include "utils\asset.h" -#include "utils\debug.h" -#include "utils\screen.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/debug.h" +#include "utils/screen.h" +#include "utils/text.h" +#include "utils/utils.h" #include #include diff --git a/source/title.h b/source/title.h index 99103be..0f39340 100644 --- a/source/title.h +++ b/source/title.h @@ -2,12 +2,12 @@ #include #include "const.h" -#include "utils\asset.h" -#include "utils\jail_audio.h" -#include "utils\screen.h" -#include "utils\sprite.h" -#include "utils\text.h" -#include "utils\utils.h" +#include "utils/asset.h" +#include "utils/jail_audio.h" +#include "utils/screen.h" +#include "utils/sprite.h" +#include "utils/text.h" +#include "utils/utils.h" #include #ifndef TITLE_H @@ -35,8 +35,8 @@ private: int counter; // Contador section_t section; // Estado del bucle principal para saber si continua o se sale std::string longText; // Texto que aparece en la parte inferior del titulo - Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa - Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa + Uint32 ticks; // Contador de ticks para ajustar la velocidad del programa + Uint32 ticksSpeed; // Velocidad a la que se repiten los bucles del programa std::vector letters; // Vector con las letras de la marquesina // Actualiza las variables