zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup includes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7186 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-11-18 18:09:48 +00:00
parent 6a97d4ea46
commit e513e1ceae
33 changed files with 154 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/audiolib/include/fx_man.h
View file

@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef FX_MAN_H_
#define FX_MAN_H_
#include "drivers.h"
#include "inttypes.h"
#include "limits.h"
#include "drivers.h"
#include "multivoc.h"
#ifdef __cplusplus

6
source/build/include/build.h
View file

@ -19,12 +19,12 @@
# error Visual Studio 2013 is the minimum supported version.
#endif
#include "collections.h"
#include "compat.h"
#include "pragmas.h"
#include "glad/glad.h"
#include "glbuild.h"
#include "palette.h"
#include "collections.h"
#include "pragmas.h"
#ifdef __cplusplus
extern "C" {
@ -255,7 +255,7 @@ enum {
//Make all variables in BUILD.H defined in the ENGINE,
//and externed in GAME
#ifdef ENGINE
#ifdef engine_c_
# define EXTERN
#else
# define EXTERN extern

2
source/build/include/collections.h
View file

@ -4,6 +4,8 @@
#ifndef collections_h_
#define collections_h_
#include "compat.h"
#if CXXSTD >= 2011 || EDUKE32_MSVC_PREREQ(1800)
// GrowArray - heap-allocated storage that can expand at runtime

4
source/build/include/common.h
View file

@ -7,10 +7,10 @@
#ifndef EDUKE32_COMMON_H_
#define EDUKE32_COMMON_H_
#include "compat.h"
#include "scriptfile.h"
#include "cache1d.h"
#include "compat.h"
#include "pragmas.h" // klabs
#include "scriptfile.h"
#ifdef __cplusplus

16
source/build/include/compat.h
View file

@ -388,25 +388,25 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
#endif
#if !defined _MSC_VER || defined __cplusplus
# include <stdint.h>
# include <inttypes.h>
# include <stdint.h>
#else
# include "msvc/inttypes.h" // from http://code.google.com/p/msinttypes/
#endif
#include <limits.h>
#include <stddef.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <float.h>
#include <math.h>
#include <time.h>
#include <ctype.h>
#include <errno.h>
#include <time.h>
#include <assert.h>
@ -425,12 +425,12 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
#endif
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#if defined(_WIN32)
# include <io.h>
# include <direct.h>
# include <io.h>
#else
# include <unistd.h>
#endif
@ -1260,8 +1260,8 @@ static inline void maybe_grow_buffer(char ** const buffer, int32_t * const buffe
#define LIBDIVIDE_C_HEADERS
#define LIBDIVIDE_NONAMESPACE
#define LIBDIVIDE_NOINLINE
#include "libdivide.h"
#include "fix16.h"
#include "libdivide.h"
/* End dependence on compat.o object. */

2
source/build/include/libdivide.h
View file

@ -21,8 +21,8 @@
#include <cstdlib>
#include <cstdio>
#else
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#endif
#if defined(__x86_64__) || defined(_WIN64) || defined(_M_X64)

6
source/build/include/polymer.h
View file

@ -3,14 +3,14 @@
#ifndef polymer_h_
# define polymer_h_
# include "compat.h"
# include "baselayer.h"
# include "glad/glad.h"
# include "build.h"
# include "compat.h"
# include "glad/glad.h"
# include "glbuild.h"
# include "osd.h"
# include "hightile.h"
# include "mdsprite.h"
# include "osd.h"
# include "polymost.h"
# include "pragmas.h"

2
source/build/include/polymost.h
View file

@ -3,9 +3,9 @@
#ifdef USE_OPENGL
#include "baselayer.h" // glinfo
#include "glad/glad.h"
#include "hightile.h"
#include "baselayer.h" // glinfo
#ifdef __cplusplus
extern "C" {

30
source/build/src/engine.cpp
View file

@ -6,37 +6,35 @@
// by Jonathon Fowler (jf@jonof.id.au)
// by the EDuke32 team (development@voidpoint.com)
#define ENGINE
#define engine_c_
#include "compat.h"
#include "build.h"
#include "editor.h"
#include "pragmas.h"
#include "cache1d.h"
#include "a.h"
#include "osd.h"
#include "crc32.h"
#include "lz4.h"
#include "colmatch.h"
#include "baselayer.h"
#include "build.h"
#include "cache1d.h"
#include "colmatch.h"
#include "compat.h"
#include "crc32.h"
#include "editor.h"
#include "engine_priv.h"
#include "lz4.h"
#include "osd.h"
#include "palette.h"
#include "pragmas.h"
#include "scriptfile.h"
#include "softsurface.h"
#ifdef USE_OPENGL
# include "glad/glad.h"
# include "glsurface.h"
# include "hightile.h"
# include "mdsprite.h"
# ifdef POLYMER
# include "polymer.h"
# endif
# include "hightile.h"
# include "polymost.h"
#endif
#include "engine_priv.h"
#include "palette.h"
#ifdef LUNATIC
# include "lunatic.h"
L_State g_engState;

2
source/build/src/glbuild.cpp
View file

@ -1,7 +1,7 @@
#include "baselayer.h"
#include "compat.h"
#include "glad/glad.h"
#include "glbuild.h"
#include "baselayer.h"
#if defined USE_OPENGL

2
source/build/src/hash.cpp
View file

@ -21,7 +21,7 @@ void hash_loop(hashtable_t *t, void(*func)(const char *, intptr_t))
void hash_free(hashtable_t *t)
{
if (t->items == NULL)
if (t == NULL || t->items == NULL)
return;
int remaining = t->size - 1;

11
source/build/src/osd.cpp
View file

@ -3,17 +3,14 @@
// by Jonathon Fowler (jf@jonof.id.au)
#include "build.h"
#include "osd.h"
#include "compat.h"
#include "baselayer.h"
#include "cache1d.h"
#include "pragmas.h"
#include "scancodes.h"
#include "crc32.h"
#include "editor.h"
#include "osd.h"
#include "scancodes.h"
#define XXH_STATIC_LINKING_ONLY
#include "xxhash.h"
#include "common.h"
#include "editor.h"
static osdsymbol_t *osd_addsymbol(const char *name);
static osdsymbol_t *osd_findsymbol(const char *pszName, osdsymbol_t *pSymbol);

32
source/build/src/sdlayer.cpp
View file

@ -1,43 +1,41 @@
// SDL interface layer for the Build Engine
// Use SDL 1.2 or 2.0 from http://www.libsdl.org
#include "compat.h"
#include <signal.h>
#include "sdl_inc.h"
#include "renderlayer.h"
#include "cache1d.h"
//#include "pragmas.h"
#include "a.h"
#include "build.h"
#include "osd.h"
#include "cache1d.h"
#include "compat.h"
#include "engine_priv.h"
#include "osd.h"
#include "palette.h"
#include "renderlayer.h"
#include "sdl_inc.h"
#include "softsurface.h"
#ifdef USE_OPENGL
# include "glad/glad.h"
# include "glbuild.h"
# include "glsurface.h"
#endif
#if defined _WIN32
# include "winbits.h"
#endif
#if defined __APPLE__
# include "osxbits.h"
# include <mach/mach.h>
# include <mach/mach_time.h>
#endif
#if defined HAVE_GTK2
# include "gtkbits.h"
#endif
#ifdef __ANDROID__
# include <android/log.h>
#endif
#if defined GEKKO
#elif defined __APPLE__
# include "osxbits.h"
# include <mach/mach.h>
# include <mach/mach_time.h>
#elif defined GEKKO
# include "wiibits.h"
# include <ogc/lwp.h>
# include <ogc/lwp_watchdog.h>
#elif defined _WIN32
# include "winbits.h"
#endif
#if SDL_MAJOR_VERSION != 1

3
source/duke3d/src/anim.h
View file

@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef anim_h_
#define anim_h_
#include "compat.h"
#include "hash.h"
typedef struct {
uint16_t frame;
int16_t sound;

3
source/duke3d/src/cheats.h
View file

@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#define MAXCHEATLEN 20
#define NUMCHEATCODES (int32_t) ARRAY_SIZE(CheatStrings)
extern void G_DoCheats(void);
extern void G_SetupCheats(void);

1
source/duke3d/src/common_game.h
View file

@ -7,6 +7,7 @@
#ifndef EDUKE32_COMMON_GAME_H_
#define EDUKE32_COMMON_GAME_H_
#include "collections.h"
#include "grpscan.h"
#ifdef __cplusplus

26
source/duke3d/src/config.h
View file

@ -23,24 +23,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef config_public_h_
#define config_public_h_
#define SETUPNAMEPARM "SETUPFILE"
#include "function.h"
int CONFIG_ReadSetup(void);
void CONFIG_GetSetupFilename( void );
int CONFIG_ReadSetup(void);
void CONFIG_WriteSetup(uint32_t flags);
void CONFIG_SetupMouse( void );
void CONFIG_SetupJoystick( void );
void CONFIG_SetDefaults(void);
void CONFIG_SetupMouse(void);
void CONFIG_SetupJoystick(void);
void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN]);
int32_t CONFIG_GetMapBestTime(char const * mapname, uint8_t const * mapmd4);
int CONFIG_SetMapBestTime(uint8_t const * mapmd4, int32_t tm);
int32_t CONFIG_GetMapBestTime(char const *mapname, uint8_t const *mapmd4);
int CONFIG_SetMapBestTime(uint8_t const *mapmd4, int32_t tm);
int32_t CONFIG_FunctionNameToNum(const char *func);
char * CONFIG_FunctionNumToName(int32_t func);
int32_t CONFIG_AnalogNameToNum(const char *func);
const char *CONFIG_AnalogNumToName(int32_t func);
void CONFIG_MapKey(int which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2);
int32_t CONFIG_FunctionNameToNum(const char *func);
char *CONFIG_FunctionNumToName(int32_t func);
int32_t CONFIG_AnalogNameToNum(const char *func);
const char *CONFIG_AnalogNumToName(int32_t func);
void CONFIG_SetDefaults(void);
#endif

5
source/duke3d/src/demo.cpp
View file

@ -20,12 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "duke3d.h"
#include "demo.h"
//#include "premap.h" // G_UpdateScreenArea()
#include "duke3d.h"
#include "input.h"
#include "menus.h"
#include "savegame.h"
#include "input.h"
#include "screens.h"
char g_firstDemoFile[BMAX_PATH];

2
source/duke3d/src/demo.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef demo_h_
#define demo_h_
#include "compat.h"
#define DEMOFN_FMT "edemo%03d.edm"
#define MAXDEMOS 1000

48
source/duke3d/src/duke3d.h
View file

@ -24,9 +24,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define duke3d_h_
// JBF
#include "compat.h"
#include "a.h"
#include "baselayer.h"
#include "build.h"
#include "cache1d.h"
#include "compat.h"
#include "file_lib.h"
#include "fx_man.h"
#include "keyboard.h"
#include "pragmas.h"
#ifdef POLYMER
#include "polymer.h"
@ -36,12 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#endif
#endif
#include "cache1d.h"
#include "pragmas.h"
#include "baselayer.h"
#include "file_lib.h"
#include "keyboard.h"
#include "fx_man.h"
#define HEAD2 APPNAME
@ -125,30 +125,30 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES);
// so that debugging with valgrind --smc-check=none is possible:
//#define DEBUG_VALGRIND_NO_SMC
#include "common_game.h"
#include "namesdyn.h"
#include "function.h"
#include "macros.h"
#include "gamedefs.h"
#include "config.h"
#include "sounds.h"
#include "control.h"
#include "_rts.h"
#include "rts.h"
#include "soundsdyn.h"
#include "music.h"
#include "inv.h"
#include "player.h"
#include "actors.h"
#include "quotes.h"
#include "global.h"
#include "sector.h"
#include "net.h"
#include "common_game.h"
#include "config.h"
#include "control.h"
#include "function.h"
#include "game.h"
#include "gamedef.h"
#include "gamedefs.h"
#include "gameexec.h"
#include "gamevars.h"
#include "global.h"
#include "inv.h"
#include "macros.h"
#include "music.h"
#include "namesdyn.h"
#include "net.h"
#include "player.h"
#include "quotes.h"
#include "rts.h"
#include "screentext.h"
#include "sector.h"
#include "sounds.h"
#include "soundsdyn.h"
#ifdef LUNATIC
# include "lunatic_game.h"

3
source/duke3d/src/game.h
View file

@ -30,6 +30,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#endif
#include "fix16.h"
#include "gamedefs.h"
#include "gamevars.h"
#include "net.h"
#ifdef __cplusplus
extern "C" {

15
source/duke3d/src/gamedef.cpp
View file

@ -20,17 +20,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "duke3d.h"
#include "namesdyn.h"
#include "gamedef.h"
#include "gameexec.h"
#include "savegame.h"
#include "cheats.h"
#include "common.h"
#include "common_game.h"
#include "cheats.h"
#include "osd.h"
#include "crc32.h"
#include "duke3d.h"
#include "gamedef.h"
#include "gameexec.h"
#include "namesdyn.h"
#include "osd.h"
#include "savegame.h"
int32_t g_scriptVersion = 13; // 13 = 1.3D-style CON files, 14 = 1.4/1.5 style CON files

6
source/duke3d/src/gamedef.h
View file

@ -23,7 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef gamedef_h_
#define gamedef_h_
#include "actors.h"
#include "build.h" // hashtable_t
#include "cheats.h"
#include "common.h" // tokenlist
#include "player.h" // projectile_t
@ -46,9 +48,6 @@ enum
#define LABEL_HASPARM2 1
#define LABEL_ISSTRING 2
#define MAXCHEATLEN 20
#define NUMCHEATCODES (int32_t)ARRAY_SIZE(CheatStrings)
#define VM_INSTMASK 0xfff
#define C_CUSTOMERROR(Text, ...) \
@ -115,7 +114,6 @@ extern int32_t g_structVarIDs;
extern intptr_t apScriptEvents[MAXEVENTS];
#endif
extern char CheatStrings[][MAXCHEATLEN];
extern char g_scriptFileName[BMAX_PATH];
extern const uint32_t CheatFunctionFlags[];

7
source/duke3d/src/gameexec.cpp
View file

@ -20,12 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "anim.h"
#include "colmatch.h"
#include "compat.h"
#include "debugbreak.h"
#include "duke3d.h"
#include "anim.h"
#include "input.h"
#include "menus.h"
#include "osdcmds.h"
@ -36,8 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# include "lunatic_game.h"
#endif
#include "debugbreak.h"
#if KRANDDEBUG
# define GAMEEXEC_INLINE
# define GAMEEXEC_STATIC

4
source/duke3d/src/gameexec.h
View file

@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define gameexec_h_
#include "build.h"
#include "sector.h" // mapstate_t
#include "gamedef.h" // vmstate_t
#include "events_defs.h"
#include "gamedef.h" // vmstate_t
#include "sector.h" // mapstate_t
#ifdef LUNATIC
# include "lunatic_game.h"

2
source/duke3d/src/gamevars.h
View file

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef gamevars_h_
#define gamevars_h_
#include "gamedef.h"
#include "fix16.hpp"
#include "gamedef.h"
#define MAXGAMEVARS 2048 // must be a power of two
#define MAXVARLABEL 26

16
source/duke3d/src/global.h
View file

@ -23,6 +23,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef global_h_
#define global_h_
#include "build.h"
#include "compat.h"
#include "duke3d.h"
#include "mmulti.h"
#include "quotes.h"
#include "sector.h"
#include "sounds.h"
#ifdef global_c_
#define G_EXTERN
#else
@ -35,9 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// duke3d global soup :(
// XXX: we don't #include everything we need.
#include "compat.h"
#include "build.h"
G_EXTERN int32_t g_interpolationCnt;
G_EXTERN int32_t g_interpolationLock;
@ -45,11 +50,6 @@ G_EXTERN int32_t oldipos[MAXINTERPOLATIONS];
G_EXTERN int32_t *curipos[MAXINTERPOLATIONS];
G_EXTERN int32_t bakipos[MAXINTERPOLATIONS];
#include "mmulti.h"
#include "duke3d.h"
#include "sector.h"
#include "quotes.h"
#ifdef __cplusplus
extern "C" {

10
source/duke3d/src/grpscan.cpp
View file

@ -20,16 +20,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "compat.h"
#include "baselayer.h"
#include "scriptfile.h"
#include "cache1d.h"
#include "crc32.h"
#include "duke3d.h"
#include "common_game.h"
#include "compat.h"
#include "crc32.h"
#include "duke3d.h"
#include "grpscan.h"
#include "scriptfile.h"
#ifndef EDUKE32_STANDALONE
static void process_vaca13(int32_t crcval);

2
source/duke3d/src/macros.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef EDUKE32_MACROS_H_
#define EDUKE32_MACROS_H_
#include "mmulti.h"
// Macros, some from SW source
#define BGSTRETCH (ud.bgstretch ? 1024 : 0)

10
source/duke3d/src/menus.cpp
View file

@ -20,17 +20,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "cheats.h"
#include "compat.h"
#include "demo.h"
#include "duke3d.h"
#include "input.h"
#include "in_android.h"
#include "menus.h"
#include "osdcmds.h"
#include "savegame.h"
#include "demo.h"
#include "xxhash.h"
#include "input.h"
#include "menus.h"
#include "cheats.h"
#include "in_android.h"
#ifndef __ANDROID__
droidinput_t droidinput;
#endif

2
source/duke3d/src/player.h
View file

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef player_h_
#define player_h_
#include "inv.h"
#include "fix16.h"
#include "inv.h"
#ifdef __cplusplus
extern "C" {

22
source/duke3d/src/screens.cpp
View file

@ -20,22 +20,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "duke3d.h"
#include "compat.h"
#include "screens.h"
#include "colmatch.h"
#include "input.h"
#include "anim.h"
#include "sbar.h"
#include "menus.h"
#include "osdfuncs.h"
#include "demo.h"
#include "mdsprite.h"
#ifdef __ANDROID__
#include "android.h"
#endif
#include "anim.h"
#include "colmatch.h"
#include "compat.h"
#include "demo.h"
#include "duke3d.h"
#include "input.h"
#include "mdsprite.h"
#include "sbar.h"
#include "screens.h"
#define COLOR_RED redcol
#define COLOR_WHITE whitecol

5
source/duke3d/src/sector.h
View file

@ -23,10 +23,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef sector_h_
#define sector_h_
#include "gamevars.h"
#include "actors.h" // actor_t
#include "player.h" // playerspawn_t
#include "gamevars.h"
#include "macros.h"
#include "namesdyn.h" // for G_GetForcefieldPicnum()
#include "player.h" // playerspawn_t
#ifdef __cplusplus
extern "C" {