Reestructurados los ficheros en carpetas

Makefile

@@ -1,15 +1,15 @@
 executable = super_pang_clone
-source = *.cpp
+source = source/*.cpp
 
 windows:
 	@echo off
 	if not exist bin\ (mkdir bin)
-	g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe
+	g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
-	strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded
+	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
 macos:
 	mkdir -p bin
-	g++ $(source) -std=c++11 -Wall -O2 -lSDL2  -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -o bin/$(executable)_macos
+	g++ $(source) -std=c++11 -Wall -O2 -lSDL2  -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -o $(executable)_macos
 linux:
 	mkdir -p bin
-	g++ $(source) -std=c++11 -Wall -Os -lSDL2  -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+	g++ $(source) -std=c++11 -Wall -Os -lSDL2  -lSDL2_image -lSDL2_mixer -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
-	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded
+	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded

source/balloon.cpp

@@ -1,5 +1,3 @@
-#include "const.h"
-#include "globals.h"
 #include "balloon.h"
 
 //Constructor

source/balloon.h

@@ -2,6 +2,8 @@
 
 #include "struct.h"
 #include "sprite.h"
+#include "const.h"
+#include "globals.h"
 
 #ifndef BALLOON_H
 #define BALLOON_H

source/bullet.cpp

@@ -1,5 +1,3 @@
-#include "const.h"
-#include "globals.h"
 #include "bullet.h"
 
 //Constructor

source/bullet.h

@@ -2,6 +2,8 @@
 
 #include "struct.h"
 #include "sprite.h"
+#include "const.h"
+#include "globals.h"
 
 #ifndef BULLET_H
 #define BULLET_H

source/gamedirector.cpp

@@ -1,13 +1,3 @@
-#include "const.h"
-#include "struct.h"
-#include "ltexture.h"
-#include "globals.h"
-#include "player.h"
-#include "balloon.h"
-#include "bullet.h"
-#include "background.h"
-#include "text.h"
-#include "menu.h"
 #include "gamedirector.h"
 
 //Calcula el cuadrado de la distancia entre dos puntos

source/gamedirector.h

@@ -1,11 +1,15 @@
 #pragma once
 
-#include "player.h"
+#include "background.h"
 #include "balloon.h"
 #include "bullet.h"
-#include "background.h"
+#include "const.h"
-#include "text.h"
+#include "globals.h"
+#include "ltexture.h"
 #include "menu.h"
+#include "player.h"
+#include "struct.h"
+#include "text.h"
 
 #ifndef GAMEDIRECTOR_H
 #define GAMEDIRECTOR_H

source/globals.h

@@ -3,7 +3,6 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_mixer.h>
-#include "ltexture.h"
 
 #ifndef GLOBALS_H
 #define GLOBALS_H
@@ -14,17 +13,6 @@ SDL_Window *gWindow = NULL;
 //El renderizador de la ventana
 SDL_Renderer *gRenderer = NULL;
 
-//Texturas con gráficos
-LTexture gPlayerTexture;
-LTexture gGameBackgroundTexture;
-LTexture gTitleBackgroundTexture;
-LTexture gWhiteFontTexture;
-LTexture gBlackFontTexture;
-LTexture gMenuTexture;
-LTexture gBalloonTexture;
-LTexture gBulletTexture;
-LTexture gMiscTexture;
-
 //Manejador para el mando 1
 SDL_Joystick* gGameController = NULL;
 

source/globals2.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "ltexture.h"
+
+#ifndef GLOBALS2_H
+#define GLOBALS2_H
+
+//Texturas con gráficos
+LTexture gPlayerTexture;
+LTexture gGameBackgroundTexture;
+LTexture gTitleBackgroundTexture;
+LTexture gWhiteFontTexture;
+LTexture gBlackFontTexture;
+LTexture gMenuTexture;
+LTexture gBalloonTexture;
+LTexture gBulletTexture;
+LTexture gMiscTexture;
+
+#endif

source/ltexture.cpp

@@ -1,9 +1,3 @@
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
-#include <stdio.h>
-#include <string>
-#include "const.h"
-#include "globals.h"
 #include "ltexture.h"
 
 LTexture::LTexture()

source/ltexture.h

@@ -2,6 +2,8 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
+#include "const.h"
+#include "globals2.h"
 #include <stdio.h>
 #include <string>
 

source/main.cpp

@@ -46,6 +46,7 @@ un tipo asociado diferente a NO_KIND
 #include "const.h"
 #include "gamedirector.h"
 #include "globals.h"
+#include "globals2.h"
 #include "ltexture.h"
 #include "menu.h"
 #include "player.h"

source/menu.cpp

@@ -1,6 +1,3 @@
-#include "const.h"
-#include "globals.h"
-#include "text.h"
 #include "menu.h"
 
 //Constructor

source/menu.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "sprite.h"
+#include "const.h"
+#include "globals.h"
+#include "text.h"
 
 #ifndef MENU_H
 #define MENU_H

source/player.cpp

@@ -1,5 +1,3 @@
-#include "const.h"
-#include "globals.h"
 #include "player.h"
 
 //Constructor

source/player.h

@@ -2,6 +2,9 @@
 
 #include "struct.h"
 #include "spriteanimated.h"
+#include "const.h"
+#include "globals.h"
+#include "globals2.h"
 
 #ifndef PLAYER_H
 #define PLAYER_H

source/spriteanimated.cpp

@@ -1,8 +1,5 @@
-#include "const.h"
 #include "spriteanimated.h"
 
-#include <iostream>
-
 //Constructor
 SpriteAnimated::SpriteAnimated()
 {

source/spriteanimated.h

@@ -3,6 +3,8 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
 #include "sprite.h"
+#include "const.h"
+#include <iostream>
 
 #ifndef SPRITEANIMATED_H
 #define SPRITEANIMATED_H

source/struct.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <SDL2/SDL.h>
+
 #ifndef STRUCT_H
 #define STRUCT_H
 

source/text.cpp

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

source/text.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "sprite.h"
+#include "const.h"
 
 #ifndef TEXT_H
 #define TEXT_H