jaildesigner-jailgames/jaildoctors_dilemma
1
0
Fork 2
Code Issues 1 Pull Requests Projects Releases 20 Wiki Activity

Actualizados los include a utils con el backslash adecuado

Browse Source
This commit is contained in:
Sergio
2022-10-10 22:26:36 +02:00
parent 8a899251ea
commit 0850b17c90
17 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/const.h
View File

@@ -2,7 +2,7 @@
#include <SDL2/SDL.h>
#include <string>
#include "utils\utils.h"
#include "utils/utils.h"
#ifndef CONST_H
#define CONST_H

16
source/credits.h
View File

@@ -2,12 +2,12 @@
#include <SDL2/SDL.h>
#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 <vector>
#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<std::string> texts; // Vector con las letras de la marquesina
SDL_Texture *textTexture; // Textura para dibujar el texto

2
source/director.cpp
View File

@@ -1,5 +1,5 @@
#include "director.h"
#include "utils\utils.h"
#include "utils/utils.h"
#include <iostream>
#include <string>

16
source/director.h
View File

@@ -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

6
source/enemy.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include <SDL2/SDL.h>
#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 <string>
#ifndef ENEMY_H

2
source/game.cpp
View File

@@ -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};

24
source/game.h
View File

@@ -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);

12
source/intro.h
View File

@@ -2,15 +2,15 @@
#include <SDL2/SDL.h>
#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 <vector>
#include <string>
#include "utils\text.h"
#include "utils/text.h"
#ifndef INTRO_H
#define INTRO_H

6
source/item.h
View File

@@ -1,9 +1,9 @@
#pragma once
#include <SDL2/SDL.h>
#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 <string>
#ifndef ITEM_H

2
source/item_tracker.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include <SDL2/SDL.h>
#include "utils\utils.h"
#include "utils/utils.h"
#include <string>
#include <vector>

10
source/logo.h
View File

@@ -2,11 +2,11 @@
#include <SDL2/SDL.h>
#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 <vector>
#ifndef LOGO_H

10
source/player.h
View File

@@ -3,11 +3,11 @@
#include <SDL2/SDL.h>
#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 <string>
#include <vector>

12
source/room.h
View File

@@ -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 <string>
#include <vector>

2
source/room_tracker.h
View File

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

8
source/scoreboard.h
View File

@@ -2,10 +2,10 @@
#include <SDL2/SDL.h>
#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 <string>
#ifndef SCOREBOARD_H

10
source/test.h
View File

@@ -2,11 +2,11 @@
#include <SDL2/SDL.h>
#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 <string>
#include <vector>

16
source/title.h
View File

@@ -2,12 +2,12 @@
#include <SDL2/SDL.h>
#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 <vector>
#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<letter_t> letters; // Vector con las letras de la marquesina
// Actualiza las variables