jaildesigner-jailgames/super_pang_clone
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Intentando arreglar los include para evitar duplicate symbols

Browse Source
This commit is contained in:
Sergio
2022-10-20 16:52:52 +02:00
parent e256ac9d89
commit 11ec100878
12 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/balloon.h
View File

@@ -1,9 +1,9 @@
#pragma once #pragma once
#include "struct.h"
#include "sprite.h" #include "sprite.h"
#include "const.h" #include "const.h"
#include "globals.h" #include "globals.h"
#include "globals2.h"
#ifndef BALLOON_H #ifndef BALLOON_H
#define BALLOON_H #define BALLOON_H

2
source/bullet.h
View File

@@ -1,9 +1,9 @@
#pragma once #pragma once
#include "struct.h"
#include "sprite.h" #include "sprite.h"
#include "const.h" #include "const.h"
#include "globals.h" #include "globals.h"
#include "globals2.h"
#ifndef BULLET_H #ifndef BULLET_H
#define BULLET_H #define BULLET_H

5
source/const.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include <SDL2/SDL.h>
#ifndef CONST_H #ifndef CONST_H
#define CONST_H #define CONST_H
@@ -105,7 +103,4 @@ const int BUTTON_START = 11;
const int BUTTON_L = 6; const int BUTTON_L = 6;
const int BUTTON_R = 7; const int BUTTON_R = 7;
//Estado del teclado SDL
//const Uint8 *keystates;
#endif #endif

1
source/gamedirector.h
View File

@@ -8,7 +8,6 @@
#include "ltexture.h" #include "ltexture.h"
#include "menu.h" #include "menu.h"
#include "player.h" #include "player.h"
#include "struct.h"
#include "text.h" #include "text.h"
#ifndef GAMEDIRECTOR_H #ifndef GAMEDIRECTOR_H

8
source/globals.h
View File

@@ -7,6 +7,14 @@
#ifndef GLOBALS_H #ifndef GLOBALS_H
#define GLOBALS_H #define GLOBALS_H
//Estructura para definir un circulo
struct Circle
{
Uint16 x;
Uint16 y;
Uint8 r;
};
//La ventana donde dibujamos //La ventana donde dibujamos
SDL_Window *gWindow = NULL; SDL_Window *gWindow = NULL;

4
source/ltexture.h
View File

@@ -1,9 +1,7 @@
#pragma once #pragma once
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include "const.h" #include "const.h"
#include "globals2.h" #include "globals.h"
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>

4
source/main.cpp
View File

@@ -37,9 +37,6 @@ un tipo asociado diferente a NO_KIND
*/ */
#define TEST_ #define TEST_
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include <SDL2/SDL_mixer.h>
#include "background.h" #include "background.h"
#include "balloon.h" #include "balloon.h"
#include "bullet.h" #include "bullet.h"
@@ -52,7 +49,6 @@ un tipo asociado diferente a NO_KIND
#include "player.h" #include "player.h"
#include "sprite.h" #include "sprite.h"
#include "spriteanimated.h" #include "spriteanimated.h"
#include "struct.h"
#include "text.h" #include "text.h"
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>

1
source/menu.h
View File

@@ -3,6 +3,7 @@
#include "sprite.h" #include "sprite.h"
#include "const.h" #include "const.h"
#include "globals.h" #include "globals.h"
#include "globals2.h"
#include "text.h" #include "text.h"
#ifndef MENU_H #ifndef MENU_H

1
source/player.h
View File

@@ -1,6 +1,5 @@
#pragma once #pragma once
#include "struct.h"
#include "spriteanimated.h" #include "spriteanimated.h"
#include "const.h" #include "const.h"
#include "globals.h" #include "globals.h"

2
source/sprite.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include "ltexture.h" #include "ltexture.h"
#ifndef SPRITE_H #ifndef SPRITE_H

2
source/spriteanimated.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include "sprite.h" #include "sprite.h"
#include "const.h" #include "const.h"
#include <iostream> #include <iostream>

16
source/struct.h
View File

@@ -1,16 +0,0 @@
#pragma once
#include <SDL2/SDL.h>
#ifndef STRUCT_H
#define STRUCT_H
//Estructura para definir un circulo
struct Circle
{
Uint16 x;
Uint16 y;
Uint8 r;
};
#endif