From f50a18eb9047cf89ca4807ac46bde2233e958764 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 23 Jun 2020 00:51:45 +0200 Subject: [PATCH] remove engine.hh header --- src/engine/aa.cc | 2 +- src/engine/bih.cc | 2 +- src/engine/blend.cc | 2 +- src/engine/command.cc | 2 +- src/engine/console.cc | 2 +- src/engine/dynlight.cc | 2 +- src/engine/engine.hh | 6 ------ src/engine/grass.cc | 2 +- src/engine/light.cc | 2 +- src/engine/main.cc | 2 +- src/engine/material.cc | 2 +- src/engine/movie.cc | 2 +- src/engine/normal.cc | 2 +- src/engine/octa.cc | 2 +- src/engine/octaedit.cc | 2 +- src/engine/octarender.cc | 2 +- src/engine/physics.cc | 2 +- src/engine/pvs.cc | 2 +- src/engine/rendergl.cc | 2 +- src/engine/renderlights.cc | 2 +- src/engine/rendermodel.cc | 2 +- src/engine/renderparticles.cc | 2 +- src/engine/rendersky.cc | 2 +- src/engine/rendertext.cc | 2 +- src/engine/renderva.cc | 2 +- src/engine/shader.cc | 2 +- src/engine/stain.cc | 2 +- src/engine/texture.cc | 2 +- src/engine/water.cc | 2 +- src/engine/world.cc | 2 +- src/engine/worldio.cc | 2 +- 31 files changed, 30 insertions(+), 36 deletions(-) delete mode 100644 src/engine/engine.hh diff --git a/src/engine/aa.cc b/src/engine/aa.cc index a5c41fa..6d3b9f5 100644 --- a/src/engine/aa.cc +++ b/src/engine/aa.cc @@ -5,7 +5,7 @@ #include "renderlights.hh" #include "texture.hh" -#include "engine.hh" +#include extern int intel_texalpha_bug; diff --git a/src/engine/bih.cc b/src/engine/bih.cc index 3aed33f..3d3f453 100644 --- a/src/engine/bih.cc +++ b/src/engine/bih.cc @@ -2,7 +2,7 @@ #include "stain.hh" #include "texture.hh" -#include "engine.hh" +#include extern vec hitsurface; diff --git a/src/engine/blend.cc b/src/engine/blend.cc index 08abcce..b7ceec7 100644 --- a/src/engine/blend.cc +++ b/src/engine/blend.cc @@ -9,7 +9,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include enum { diff --git a/src/engine/command.cc b/src/engine/command.cc index d94799b..0c34e3a 100644 --- a/src/engine/command.cc +++ b/src/engine/command.cc @@ -6,7 +6,7 @@ #include "console.hh" #include "main.hh" // fatal -#include "engine.hh" +#include hashnameset idents; // contains ALL vars/commands/aliases vector identmap; diff --git a/src/engine/console.cc b/src/engine/console.cc index 16a07c4..ae34766 100644 --- a/src/engine/console.cc +++ b/src/engine/console.cc @@ -7,7 +7,7 @@ #include "octaedit.hh" // editmode #include "rendertext.hh" -#include "engine.hh" +#include static void resetcomplete(); static void complete(char *s, int maxlen, const char *cmdprefix); diff --git a/src/engine/dynlight.cc b/src/engine/dynlight.cc index f6ebcb6..0a98d8e 100644 --- a/src/engine/dynlight.cc +++ b/src/engine/dynlight.cc @@ -3,7 +3,7 @@ #include "pvs.hh" #include "renderva.hh" -#include "engine.hh" +#include VARNP(dynlights, usedynlights, 0, 1, 1); VARP(dynlightdist, 0, 1024, 10000); diff --git a/src/engine/engine.hh b/src/engine/engine.hh deleted file mode 100644 index 34b4df0..0000000 --- a/src/engine/engine.hh +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ENGINE_H__ -#define __ENGINE_H__ - -#include "cube.hh" - -#endif diff --git a/src/engine/grass.cc b/src/engine/grass.cc index b27d635..660e8d3 100644 --- a/src/engine/grass.cc +++ b/src/engine/grass.cc @@ -3,7 +3,7 @@ #include "renderva.hh" #include "texture.hh" -#include "engine.hh" +#include VARP(grass, 0, 1, 1); VAR(dbggrass, 0, 0, 1); diff --git a/src/engine/light.cc b/src/engine/light.cc index 1589e0b..2f70e9b 100644 --- a/src/engine/light.cc +++ b/src/engine/light.cc @@ -11,7 +11,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include CVAR1R(ambient, 0x191919); FVARR(ambientscale, 0, 1, 16); diff --git a/src/engine/main.cc b/src/engine/main.cc index 8007cd1..8e5ddce 100644 --- a/src/engine/main.cc +++ b/src/engine/main.cc @@ -19,7 +19,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include static SDL_Window *screen = NULL; static int curvsync = -1; diff --git a/src/engine/material.cc b/src/engine/material.cc index 57d9a88..c161da0 100644 --- a/src/engine/material.cc +++ b/src/engine/material.cc @@ -8,7 +8,7 @@ #include "water.hh" #include "world.hh" -#include "engine.hh" +#include vector editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4]; diff --git a/src/engine/movie.cc b/src/engine/movie.cc index 9507f3d..a8e8362 100644 --- a/src/engine/movie.cc +++ b/src/engine/movie.cc @@ -15,7 +15,7 @@ #include "rendertext.hh" #include "texture.hh" -#include "engine.hh" +#include VAR(dbgmovie, 0, 0, 1); diff --git a/src/engine/normal.cc b/src/engine/normal.cc index c6bb424..71ea87a 100644 --- a/src/engine/normal.cc +++ b/src/engine/normal.cc @@ -4,7 +4,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include struct normalkey { diff --git a/src/engine/octa.cc b/src/engine/octa.cc index addb180..15fa7fb 100644 --- a/src/engine/octa.cc +++ b/src/engine/octa.cc @@ -9,7 +9,7 @@ #include "octarender.hh" #include "world.hh" -#include "engine.hh" +#include static const uchar fv[6][4] = // indexes for cubecoords, per each vert of a face orientation { diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc index a27a8a1..db99a41 100644 --- a/src/engine/octaedit.cc +++ b/src/engine/octaedit.cc @@ -14,7 +14,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include extern int outline; diff --git a/src/engine/octarender.cc b/src/engine/octarender.cc index 7fec8aa..517678e 100644 --- a/src/engine/octarender.cc +++ b/src/engine/octarender.cc @@ -16,7 +16,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include struct vboinfo { diff --git a/src/engine/physics.cc b/src/engine/physics.cc index a37a09c..9477983 100644 --- a/src/engine/physics.cc +++ b/src/engine/physics.cc @@ -11,7 +11,7 @@ #include "octa.hh" #include "world.hh" -#include "engine.hh" +#include #include "mpr.hh" const int MAXCLIPOFFSET = 4; diff --git a/src/engine/pvs.cc b/src/engine/pvs.cc index 86ac3ce..4e58d24 100644 --- a/src/engine/pvs.cc +++ b/src/engine/pvs.cc @@ -6,7 +6,7 @@ #include "octarender.hh" // valist #include "world.hh" -#include "engine.hh" +#include enum { diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc index 7af9a83..751068c 100644 --- a/src/engine/rendergl.cc +++ b/src/engine/rendergl.cc @@ -19,7 +19,7 @@ #include "texture.hh" #include "water.hh" -#include "engine.hh" +#include bool hasVAO = false, hasTR = false, hasTSW = false, hasPBO = false, hasFBO = false, hasAFBO = false, hasDS = false, hasTF = false, hasCBF = false, hasS3TC = false, hasFXT1 = false, hasLATC = false, hasRGTC = false, hasAF = false, hasFBB = false, hasFBMS = false, hasTMS = false, hasMSS = false, hasFBMSBS = false, hasUBO = false, hasMBR = false, hasDB2 = false, hasDBB = false, hasTG = false, hasTQ = false, hasPF = false, hasTRG = false, hasTI = false, hasHFV = false, hasHFP = false, hasDBT = false, hasDC = false, hasDBGO = false, hasEGPU4 = false, hasGPU4 = false, hasGPU5 = false, hasBFE = false, hasEAL = false, hasCR = false, hasOQ2 = false, hasES3 = false, hasCB = false, hasCI = false; bool mesa = false, intel = false, amd = false, nvidia = false; diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc index 1f62c4e..9967f12 100644 --- a/src/engine/renderlights.cc +++ b/src/engine/renderlights.cc @@ -17,7 +17,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include #define CHANGE_SHADERS 0 diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc index 8cec77f..8e77900 100644 --- a/src/engine/rendermodel.cc +++ b/src/engine/rendermodel.cc @@ -11,7 +11,7 @@ #include "shader.hh" #include "texture.hh" -#include "engine.hh" +#include VAR(oqdynent, 0, 1, 1); VAR(animationinterpolationtime, 0, 200, 1000); diff --git a/src/engine/renderparticles.cc b/src/engine/renderparticles.cc index 9a6b99f..bc5c82a 100644 --- a/src/engine/renderparticles.cc +++ b/src/engine/renderparticles.cc @@ -15,7 +15,7 @@ #include "water.hh" #include "world.hh" -#include "engine.hh" +#include #if 0 void regular_particle_flame(int type, const vec &p, float radius, float height, int color, int density = 3, float scale = 2.0f, float speed = 200.0f, float fade = 600.0f, int gravity = -15); diff --git a/src/engine/rendersky.cc b/src/engine/rendersky.cc index 774d2d5..55ca1b5 100644 --- a/src/engine/rendersky.cc +++ b/src/engine/rendersky.cc @@ -7,7 +7,7 @@ #include "renderva.hh" #include "texture.hh" -#include "engine.hh" +#include static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 }; diff --git a/src/engine/rendertext.cc b/src/engine/rendertext.cc index 41c228f..859a280 100644 --- a/src/engine/rendertext.cc +++ b/src/engine/rendertext.cc @@ -4,7 +4,7 @@ #include "rendergl.hh" // xtraverts #include "texture.hh" -#include "engine.hh" +#include static hashnameset fonts; static font *fontdef = NULL; diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc index 9b5c98f..912b593 100644 --- a/src/engine/renderva.cc +++ b/src/engine/renderva.cc @@ -15,7 +15,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert) { diff --git a/src/engine/shader.cc b/src/engine/shader.cc index a077325..88462d4 100644 --- a/src/engine/shader.cc +++ b/src/engine/shader.cc @@ -10,7 +10,7 @@ #include "rendermodel.hh" // cleanupmodels #include "texture.hh" -#include "engine.hh" +#include Shader *Shader::lastshader = NULL; diff --git a/src/engine/stain.cc b/src/engine/stain.cc index c43691c..1e7ad74 100644 --- a/src/engine/stain.cc +++ b/src/engine/stain.cc @@ -9,7 +9,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include struct stainvert { diff --git a/src/engine/texture.cc b/src/engine/texture.cc index 676ba86..7963e08 100644 --- a/src/engine/texture.cc +++ b/src/engine/texture.cc @@ -14,7 +14,7 @@ #include "shader.hh" #include "world.hh" -#include "engine.hh" +#include #ifdef __APPLE__ #include "SDL2_image/SDL_image.h" diff --git a/src/engine/water.cc b/src/engine/water.cc index 3d17158..9639f93 100644 --- a/src/engine/water.cc +++ b/src/engine/water.cc @@ -6,7 +6,7 @@ #include "texture.hh" #include "world.hh" -#include "engine.hh" +#include extern const vec matnormals[6]; diff --git a/src/engine/world.cc b/src/engine/world.cc index 60af5e5..32a7f90 100644 --- a/src/engine/world.cc +++ b/src/engine/world.cc @@ -19,7 +19,7 @@ #include "worldio.hh" #include "world.hh" -#include "engine.hh" +#include VARNR(mapscale, worldscale, 1, 0, 0); VARNR(mapsize, worldsize, 1, 0, 0); diff --git a/src/engine/worldio.cc b/src/engine/worldio.cc index a006b33..064db6a 100644 --- a/src/engine/worldio.cc +++ b/src/engine/worldio.cc @@ -13,7 +13,7 @@ #include "world.hh" #include "worldio.hh" -#include "engine.hh" +#include #define OCTAVERSION 33