Reballats tots els .h i .cpp en la mateixa carpeta

Makefile

@@ -24,7 +24,7 @@ INCLUDES:= -I$(DIR_SOURCES)
 # Variables según el sistema operativo
 ifeq ($(OS),Windows_NT)
     FixPath = $(subst /,\,$1)
-	SOURCES := source/*.cpp source/common/*.cpp
+	SOURCES := source/*.cpp
 	CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows
 	CXXFLAGS_DEBUG:= -std=c++11 -Wall
 	LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2 -lopengl32
@@ -33,7 +33,7 @@ ifeq ($(OS),Windows_NT)
 else
     FixPath = $1
 	SOURCES := $(shell find $(DIR_SOURCES) -name '*.cpp')
-	SOURCES := source/*.cpp source/common/*.cpp
+	SOURCES := source/*.cpp
 	CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections
 	CXXFLAGS_DEBUG:= -std=c++11 -Wall
 	LDFLAGS := -lSDL2

source/background.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/movingsprite.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "movingsprite.h"
+#include "utils.h"
 
 /*
     Esta clase es la encargada de dibujar el fondo que aparece durante la sección

source/balloon.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "utils.h"
 #include <sstream>
 #include <vector>
 

source/bullet.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "sprite.h"
+#include "utils.h"
 
 // Tipos de bala
 #define BULLET_UP 1

source/const.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "utils.h"
 
 // Tamaño de bloque
 #define BLOCK 8

source/define_buttons.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/input.h"
-#include "common/text.h"
+#include "input.h"
+#include "text.h"
 #include "const.h"
 #include "lang.h"
 

source/director.cpp

@@ -1,4 +1,4 @@
-#include "common/utils.h"
+#include "utils.h"
 #include "const.h"
 #include "director.h"
 #include <iostream>
@@ -6,7 +6,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "common/dbgtxt.h"
+#include "dbgtxt.h"
 
 #ifndef _WIN32
 #include <pwd.h>

source/director.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"

source/enemy_formations.h

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

source/explosions.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/texture.h"
-#include "common/animatedsprite.h"
+#include "texture.h"
+#include "animatedsprite.h"
 #include <vector>
 
 struct explosion_texture_t

source/fade.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/texture.h"
-#include "common/utils.h"
+#include "texture.h"
+#include "utils.h"
 
 // Tipos de fundido
 #define FADE_FULLSCREEN 0

source/game.h

@@ -3,15 +3,15 @@
 #include <SDL2/SDL.h>
 #include "balloon.h"
 #include "bullet.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.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 "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "item.h"

source/game_logo.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/smartsprite.h"
-#include "common/jail_audio.h"
+#include "asset.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "jail_audio.h"
 #include "const.h"
 
 // Clase GameLogo

source/hiscore_table.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 #include "fade.h"

source/instructions.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 #include "tiledbg.h"

source/intro.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/smartsprite.h"
-#include "common/utils.h"
-#include "common/writer.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "utils.h"
+#include "writer.h"
 #include "const.h"
 #include "lang.h"
 #include <vector>

source/item.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "utils.h"
 
 // Tipos de objetos
 #define ITEM_POINTS_1_DISK 1

source/logo.h

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

source/manage_hiscore_table.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include "common/utils.h"
+#include "utils.h"
 
 /*
     Esta clase sirve para añadir elementos hiScoreEntry_r a un vector (tabla), de manera

source/param.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "utils.h"
 #include "const.h"
 
 extern param_t param;

source/player.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "texture.h"
+#include "utils.h"
 
 // Estados del jugador
 #define PLAYER_STATUS_WALKING_LEFT 0

source/scoreboard.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 

source/screen.h

@@ -5,7 +5,7 @@
 #include "utils.h"
 #include "notify.h"
 #include "input.h"
-#include "../const.h"
+#include "const.h"
 #include <vector>
 
 #define SCREEN_FILTER_NEAREST 0

source/tiledbg.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/sprite.h"
+#include "asset.h"
+#include "screen.h"
+#include "sprite.h"
 #include "const.h"
 
 // Modos de funcionamiento para el tileado de fondo

source/title.h

@@ -1,15 +1,15 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.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 "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"