diff --git a/source/balloon.h b/source/balloon.h index df1e9b8..43ee433 100644 --- a/source/balloon.h +++ b/source/balloon.h @@ -1,9 +1,9 @@ #pragma once -#include "struct.h" #include "sprite.h" #include "const.h" #include "globals.h" +#include "globals2.h" #ifndef BALLOON_H #define BALLOON_H diff --git a/source/bullet.h b/source/bullet.h index db057d7..a049a09 100644 --- a/source/bullet.h +++ b/source/bullet.h @@ -1,9 +1,9 @@ #pragma once -#include "struct.h" #include "sprite.h" #include "const.h" #include "globals.h" +#include "globals2.h" #ifndef BULLET_H #define BULLET_H diff --git a/source/const.h b/source/const.h index 854d6df..d02dee1 100644 --- a/source/const.h +++ b/source/const.h @@ -1,7 +1,5 @@ #pragma once -#include - #ifndef CONST_H #define CONST_H @@ -105,7 +103,4 @@ const int BUTTON_START = 11; const int BUTTON_L = 6; const int BUTTON_R = 7; -//Estado del teclado SDL -//const Uint8 *keystates; - #endif \ No newline at end of file diff --git a/source/gamedirector.h b/source/gamedirector.h index 158be9c..7dda96b 100644 --- a/source/gamedirector.h +++ b/source/gamedirector.h @@ -8,7 +8,6 @@ #include "ltexture.h" #include "menu.h" #include "player.h" -#include "struct.h" #include "text.h" #ifndef GAMEDIRECTOR_H diff --git a/source/globals.h b/source/globals.h index 96ae335..ebf17e2 100644 --- a/source/globals.h +++ b/source/globals.h @@ -7,6 +7,14 @@ #ifndef GLOBALS_H #define GLOBALS_H +//Estructura para definir un circulo +struct Circle +{ + Uint16 x; + Uint16 y; + Uint8 r; +}; + //La ventana donde dibujamos SDL_Window *gWindow = NULL; diff --git a/source/ltexture.h b/source/ltexture.h index feb4bb1..445a60e 100644 --- a/source/ltexture.h +++ b/source/ltexture.h @@ -1,9 +1,7 @@ #pragma once -#include -#include #include "const.h" -#include "globals2.h" +#include "globals.h" #include #include diff --git a/source/main.cpp b/source/main.cpp index 27fb9c6..47bb344 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -37,9 +37,6 @@ un tipo asociado diferente a NO_KIND */ #define TEST_ -#include -#include -#include #include "background.h" #include "balloon.h" #include "bullet.h" @@ -52,7 +49,6 @@ un tipo asociado diferente a NO_KIND #include "player.h" #include "sprite.h" #include "spriteanimated.h" -#include "struct.h" #include "text.h" #include #include diff --git a/source/menu.h b/source/menu.h index 3ad1bfb..53e598d 100644 --- a/source/menu.h +++ b/source/menu.h @@ -3,6 +3,7 @@ #include "sprite.h" #include "const.h" #include "globals.h" +#include "globals2.h" #include "text.h" #ifndef MENU_H diff --git a/source/player.h b/source/player.h index 60f1678..57f4f24 100644 --- a/source/player.h +++ b/source/player.h @@ -1,6 +1,5 @@ #pragma once -#include "struct.h" #include "spriteanimated.h" #include "const.h" #include "globals.h" diff --git a/source/sprite.h b/source/sprite.h index d6eafcc..4b089e4 100644 --- a/source/sprite.h +++ b/source/sprite.h @@ -1,7 +1,5 @@ #pragma once -#include -#include #include "ltexture.h" #ifndef SPRITE_H diff --git a/source/spriteanimated.h b/source/spriteanimated.h index 693d745..284b372 100644 --- a/source/spriteanimated.h +++ b/source/spriteanimated.h @@ -1,7 +1,5 @@ #pragma once -#include -#include #include "sprite.h" #include "const.h" #include diff --git a/source/struct.h b/source/struct.h deleted file mode 100644 index 7f0c7bb..0000000 --- a/source/struct.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include - -#ifndef STRUCT_H -#define STRUCT_H - -//Estructura para definir un circulo -struct Circle -{ - Uint16 x; - Uint16 y; - Uint8 r; -}; - -#endif \ No newline at end of file