remove engine.hh header

2020-06-23 00:51:45 +02:00 · 2020-06-23 00:51:45 +02:00 · f50a18eb90
commit f50a18eb90
parent 2e6e1aa3de
31 changed files with 30 additions and 36 deletions
--- a/src/engine/aa.cc
+++ b/src/engine/aa.cc
@ -5,7 +5,7 @@
 #include "renderlights.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 extern int intel_texalpha_bug;

--- a/src/engine/bih.cc
+++ b/src/engine/bih.cc
@ -2,7 +2,7 @@
 #include "stain.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 extern vec hitsurface;

--- a/src/engine/blend.cc
+++ b/src/engine/blend.cc
@ -9,7 +9,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 enum
 {
--- 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 <shared/cube.hh>

 hashnameset<ident> idents; // contains ALL vars/commands/aliases
 vector<ident *> identmap;
--- 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 <shared/cube.hh>

 static void resetcomplete();
 static void complete(char *s, int maxlen, const char *cmdprefix);
--- a/src/engine/dynlight.cc
+++ b/src/engine/dynlight.cc
@ -3,7 +3,7 @@
 #include "pvs.hh"
 #include "renderva.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 VARNP(dynlights, usedynlights, 0, 1, 1);
 VARP(dynlightdist, 0, 1024, 10000);
--- a/src/engine/engine.hh
+++ b/src/engine/engine.hh
@ -1,6 +0,0 @@
-#ifndef __ENGINE_H__
-#define __ENGINE_H__
-
-#include "cube.hh"
-
-#endif
--- a/src/engine/grass.cc
+++ b/src/engine/grass.cc
@ -3,7 +3,7 @@
 #include "renderva.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 VARP(grass, 0, 1, 1);
 VAR(dbggrass, 0, 0, 1);
--- a/src/engine/light.cc
+++ b/src/engine/light.cc
@ -11,7 +11,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 CVAR1R(ambient, 0x191919);
 FVARR(ambientscale, 0, 1, 16);
--- a/src/engine/main.cc
+++ b/src/engine/main.cc
@ -19,7 +19,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 static SDL_Window *screen = NULL;
 static int curvsync = -1;
--- a/src/engine/material.cc
+++ b/src/engine/material.cc
@ -8,7 +8,7 @@
 #include "water.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];

--- a/src/engine/movie.cc
+++ b/src/engine/movie.cc
@ -15,7 +15,7 @@
 #include "rendertext.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 VAR(dbgmovie, 0, 0, 1);

--- a/src/engine/normal.cc
+++ b/src/engine/normal.cc
@ -4,7 +4,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 struct normalkey
 {
--- a/src/engine/octa.cc
+++ b/src/engine/octa.cc
@ -9,7 +9,7 @@
 #include "octarender.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 static const uchar fv[6][4] = // indexes for cubecoords, per each vert of a face orientation
 {
--- a/src/engine/octaedit.cc
+++ b/src/engine/octaedit.cc
@ -14,7 +14,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 extern int outline;

--- a/src/engine/octarender.cc
+++ b/src/engine/octarender.cc
@ -16,7 +16,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 struct vboinfo
 {
--- a/src/engine/physics.cc
+++ b/src/engine/physics.cc
@ -11,7 +11,7 @@
 #include "octa.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>
 #include "mpr.hh"

 const int MAXCLIPOFFSET = 4;
--- 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 <shared/cube.hh>

 enum
 {
--- a/src/engine/rendergl.cc
+++ b/src/engine/rendergl.cc
@ -19,7 +19,7 @@
 #include "texture.hh"
 #include "water.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 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;
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@ -17,7 +17,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 #define CHANGE_SHADERS 0

--- a/src/engine/rendermodel.cc
+++ b/src/engine/rendermodel.cc
@ -11,7 +11,7 @@
 #include "shader.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 VAR(oqdynent, 0, 1, 1);
 VAR(animationinterpolationtime, 0, 200, 1000);
--- a/src/engine/renderparticles.cc
+++ b/src/engine/renderparticles.cc
@ -15,7 +15,7 @@
 #include "water.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 #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);
--- a/src/engine/rendersky.cc
+++ b/src/engine/rendersky.cc
@ -7,7 +7,7 @@
 #include "renderva.hh"
 #include "texture.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };

--- 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 <shared/cube.hh>

 static hashnameset<font> fonts;
 static font *fontdef = NULL;
--- a/src/engine/renderva.cc
+++ b/src/engine/renderva.cc
@ -15,7 +15,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
 {
--- 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 <shared/cube.hh>

 Shader *Shader::lastshader = NULL;

--- a/src/engine/stain.cc
+++ b/src/engine/stain.cc
@ -9,7 +9,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 struct stainvert
 {
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@ -14,7 +14,7 @@
 #include "shader.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 #ifdef __APPLE__
  #include "SDL2_image/SDL_image.h"
--- a/src/engine/water.cc
+++ b/src/engine/water.cc
@ -6,7 +6,7 @@
 #include "texture.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 extern const vec matnormals[6];

--- a/src/engine/world.cc
+++ b/src/engine/world.cc
@ -19,7 +19,7 @@
 #include "worldio.hh"
 #include "world.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 VARNR(mapscale, worldscale, 1, 0, 0);
 VARNR(mapsize, worldsize, 1, 0, 0);
--- a/src/engine/worldio.cc
+++ b/src/engine/worldio.cc
@ -13,7 +13,7 @@
 #include "world.hh"
 #include "worldio.hh"

-#include "engine.hh"
+#include <shared/cube.hh>

 #define OCTAVERSION 33