From cf85ca86956b0d7f2bddeea4277a3cc2ce9f4946 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 04:39:41 +0200
Subject: [PATCH] remove igame.hh include from cube.hh

---
 src/engine/blend.cc           | 1 +
 src/engine/command.cc         | 1 +
 src/engine/console.cc         | 1 +
 src/engine/dynlight.cc        | 1 +
 src/engine/light.cc           | 1 +
 src/engine/main.cc            | 1 +
 src/engine/octa.cc            | 1 +
 src/engine/octaedit.cc        | 1 +
 src/engine/octarender.cc      | 1 +
 src/engine/physics.cc         | 2 ++
 src/engine/rendergl.cc        | 1 +
 src/engine/renderlights.cc    | 1 +
 src/engine/rendermodel.cc     | 1 +
 src/engine/renderparticles.cc | 1 +
 src/engine/renderva.cc        | 1 +
 src/engine/stain.cc           | 1 +
 src/engine/texture.cc         | 1 +
 src/engine/world.cc           | 1 +
 src/engine/worldio.cc         | 1 +
 src/game/game.cc              | 1 +
 src/shared/cube.hh            | 2 --
 21 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/engine/blend.cc b/src/engine/blend.cc
index 33469eb..9597d9a 100644
--- a/src/engine/blend.cc
+++ b/src/engine/blend.cc
@@ -10,6 +10,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 enum
 {
diff --git a/src/engine/command.cc b/src/engine/command.cc
index a9c90ad..d4ab9a1 100644
--- a/src/engine/command.cc
+++ b/src/engine/command.cc
@@ -7,6 +7,7 @@
 #include "main.hh" // fatal, timings
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 hashnameset<ident> idents; // contains ALL vars/commands/aliases
 vector<ident *> identmap;
diff --git a/src/engine/console.cc b/src/engine/console.cc
index ae34766..29d1e92 100644
--- a/src/engine/console.cc
+++ b/src/engine/console.cc
@@ -8,6 +8,7 @@
 #include "rendertext.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 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 4d80c97..fae7974 100644
--- a/src/engine/dynlight.cc
+++ b/src/engine/dynlight.cc
@@ -7,6 +7,7 @@
 #include "renderva.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 VARNP(dynlights, usedynlights, 0, 1, 1);
 VARP(dynlightdist, 0, 1024, 10000);
diff --git a/src/engine/light.cc b/src/engine/light.cc
index e451e08..ebdc789 100644
--- a/src/engine/light.cc
+++ b/src/engine/light.cc
@@ -12,6 +12,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 CVAR1R(ambient, 0x191919);
 FVARR(ambientscale, 0, 1, 16);
diff --git a/src/engine/main.cc b/src/engine/main.cc
index 8e5ddce..f336ace 100644
--- a/src/engine/main.cc
+++ b/src/engine/main.cc
@@ -20,6 +20,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 static SDL_Window *screen = NULL;
 static int curvsync = -1;
diff --git a/src/engine/octa.cc b/src/engine/octa.cc
index 3ae9a6e..84973ce 100644
--- a/src/engine/octa.cc
+++ b/src/engine/octa.cc
@@ -10,6 +10,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 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 39769c3..799475e 100644
--- a/src/engine/octaedit.cc
+++ b/src/engine/octaedit.cc
@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 extern int outline;
 
diff --git a/src/engine/octarender.cc b/src/engine/octarender.cc
index 517678e..209a3cd 100644
--- a/src/engine/octarender.cc
+++ b/src/engine/octarender.cc
@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 struct vboinfo
 {
diff --git a/src/engine/physics.cc b/src/engine/physics.cc
index f201668..7ab2103 100644
--- a/src/engine/physics.cc
+++ b/src/engine/physics.cc
@@ -13,6 +13,8 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
+
 #include "mpr.hh"
 
 const int MAXCLIPOFFSET = 4;
diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc
index f8ee0bf..d876643 100644
--- a/src/engine/rendergl.cc
+++ b/src/engine/rendergl.cc
@@ -21,6 +21,7 @@
 #include "water.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0);
 
diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc
index 4f267df..cd6648a 100644
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@@ -18,6 +18,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 #define CHANGE_SHADERS 0
 
diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc
index 66ffe2e..f9063dc 100644
--- a/src/engine/rendermodel.cc
+++ b/src/engine/rendermodel.cc
@@ -13,6 +13,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 VAR(oqdynent, 0, 1, 1);
 VAR(animationinterpolationtime, 0, 200, 1000);
diff --git a/src/engine/renderparticles.cc b/src/engine/renderparticles.cc
index a64c9bf..0c91db1 100644
--- a/src/engine/renderparticles.cc
+++ b/src/engine/renderparticles.cc
@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.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);
diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc
index 3526cc7..5365491 100644
--- a/src/engine/renderva.cc
+++ b/src/engine/renderva.cc
@@ -16,6 +16,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
 {
diff --git a/src/engine/stain.cc b/src/engine/stain.cc
index a0770c5..6a03276 100644
--- a/src/engine/stain.cc
+++ b/src/engine/stain.cc
@@ -10,6 +10,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 struct stainvert
 {
diff --git a/src/engine/texture.cc b/src/engine/texture.cc
index 7963e08..4363e4b 100644
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@@ -15,6 +15,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 #ifdef __APPLE__
   #include "SDL2_image/SDL_image.h"
diff --git a/src/engine/world.cc b/src/engine/world.cc
index 10e2f8c..8abd0ca 100644
--- a/src/engine/world.cc
+++ b/src/engine/world.cc
@@ -20,6 +20,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 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 064db6a..d3183a4 100644
--- a/src/engine/worldio.cc
+++ b/src/engine/worldio.cc
@@ -14,6 +14,7 @@
 #include "worldio.hh"
 
 #include <shared/cube.hh>
+#include <shared/igame.hh>
 
 #define OCTAVERSION 33
 
diff --git a/src/game/game.cc b/src/game/game.cc
index bef6bfa..4b5c849 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -3,6 +3,7 @@
 #include <engine/main.hh>
 #include <engine/octaedit.hh>
 #include <engine/physics.hh>
+#include <engine/texture.hh>
 #include <engine/worldio.hh>
 #include <engine/world.hh>
 
diff --git a/src/shared/cube.hh b/src/shared/cube.hh
index d4de315..30a7e6a 100644
--- a/src/shared/cube.hh
+++ b/src/shared/cube.hh
@@ -50,7 +50,5 @@
 #include "glemu.hh"
 #endif
 
-#include "igame.hh"
-
 #endif