Moguts tots els .cpp a la mateixa carpeta

Makefile

@@ -1,5 +1,5 @@
 executable = jaildoctors_dilemma
-source = source/*.cpp source/jail_engine/*.cpp
+source = source/*.cpp
 appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
 version = v1.09

source/cheevos.h

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

source/const.h

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

source/debug.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "../const.h"
+#include "const.h"
 #include "asset.h"
 #include "screen.h"
 #include "text.h"

source/director.cpp

@@ -1,4 +1,4 @@
-#include "jail_engine/utils.h"
+#include "utils.h"
 #include "director.h"
 #include <errno.h>
 #include <iostream>

source/director.h

@@ -1,14 +1,14 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/debug.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/movingsprite.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "resource.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "gamestate_credits.h"
 #include "gamestate_demo.h"

source/enemy.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "utils.h"
 #include <string>
 
 #ifndef ENEMY_H

source/gamestate_credits.h

@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/texture.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 

source/gamestate_demo.h

@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/debug.h"
-#include "jail_engine/input.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "debug.h"
+#include "input.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "room_tracker.h"

source/gamestate_ending.h

@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/texture.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <string>
 #include <vector>

source/gamestate_ending2.h

@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/texture.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 #include <string>

source/gamestate_game.h

@@ -2,16 +2,16 @@
 
 #include <SDL2/SDL.h>
 #include "cheevos.h"
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/debug.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "player.h"

source/gamestate_game_over.h

@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/texture.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 

source/gamestate_loading_screen.h

@@ -1,18 +1,18 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
 #include <string>
-#include "jail_engine/text.h"
+#include "text.h"
 
 #ifndef LOADING_SCREEN_H
 #define LOADING_SCREEN_H

source/gamestate_logo.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 

source/gamestate_title.h

@@ -2,15 +2,15 @@
 
 #include <SDL2/SDL.h>
 #include "cheevos.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/input.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/paleta.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "paleta.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 

source/item.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "sprite.h"
+#include "utils.h"
 #include <string>
 
 #ifndef ITEM_H

source/item_tracker.h

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

source/menu.cpp

@@ -1,4 +1,4 @@
-#include "../const.h"
+#include "const.h"
 #include "menu.h"
 
 // Constructor

source/movingsprite.cpp

@@ -1,4 +1,4 @@
-#include "../const.h"
+#include "const.h"
 #include "movingsprite.h"
 
 // Constructor

source/player.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/debug.h"
-#include "jail_engine/input.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "resource.h"
+#include "utils.h"
 #include "const.h"
 #include "room.h"
 #include <string>
@@ -81,8 +81,8 @@ public:
 	SDL_Rect lastPosition;				   // Contiene la ultima posición del jugador, por si hay que deshacer algun movimiento
 	int jumpIni;						   // Valor del eje Y en el que se inicia el salto
 	float maxVY;						   // Velocidad máxima que puede alcanzar al desplazarse en vertical
-	std::vector<JA_Sound_t*> jumpSound;	   // Vecor con todos los sonidos del salto
-	std::vector<JA_Sound_t*> fallSound;	   // Vecor con todos los sonidos de la caída
+	std::vector<JA_Sound_t *> jumpSound;   // Vecor con todos los sonidos del salto
+	std::vector<JA_Sound_t *> fallSound;   // Vecor con todos los sonidos de la caída
 	int jumpCounter;					   // Cuenta el tiempo de salto
 	int fallCounter;					   // Cuenta el tiempo de caida
 	bool alive;							   // Indica si el jugador esta vivo o no

source/resource.h

@@ -3,7 +3,7 @@
 #include <SDL2/SDL.h>
 #include "animatedsprite.h"
 #include "asset.h"
-#include "../room.h"
+#include "room.h"
 #include "text.h"
 #include "texture.h"
 #include "utils.h"

source/room.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/debug.h"
-#include "jail_engine/jail_audio.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "debug.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include "enemy.h"
 #include "item_tracker.h"

source/room_tracker.h

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

source/scoreboard.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/resource.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "resource.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include <string>
 

source/screen.h

@@ -4,7 +4,7 @@
 #include "asset.h"
 #include "notify.h"
 #include "utils.h"
-#include "../const.h"
+#include "const.h"
 #include <vector>
 
 #ifndef SCREEN_H

source/stats.h

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