remove cube.hh

src/engine/aa.cc

@@ -1,13 +1,13 @@
 #include "aa.hh"
 
+#include <shared/glemu.hh>
+#include <shared/command.hh>
+
 #include "main.hh" // fatal
 #include "rendergl.hh"
 #include "renderlights.hh"
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 extern int intel_texalpha_bug;
 
 VARFP(tqaa, 0, 0, 1, cleanupaa());

src/engine/bih.cc

@@ -1,11 +1,10 @@
+#include <shared/ents.hh>
+
 #include "physics.hh"
 #include "rendermodel.hh" // loadmapmodel
 #include "stain.hh"
 #include "texture.hh"
 
-#include <shared/ents.hh>
-#include <shared/cube.hh>
-
 extern vec hitsurface;
 
 bool BIH::triintersect(const mesh &m, int tidx, const vec &mo, const vec &mray, float maxdist, float &dist, int mode)

src/engine/blend.cc

@@ -1,5 +1,8 @@
 #include "blend.hh"
 
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "console.hh" /* conoutf */
 #include "light.hh"
 #include "main.hh" // multiplayer, timings
@@ -9,9 +12,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 enum
 {
     BM_BRANCH = 0,

src/engine/command.cc

@@ -3,12 +3,11 @@
 
 #include "command.hh"
 
+#include <shared/igame.hh>
+
 #include "console.hh"
 #include "main.hh" // fatal, timings
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 hashnameset<ident> idents; // contains ALL vars/commands/aliases
 vector<ident *> identmap;
 ident *dummyident = NULL;

src/engine/console.cc

@@ -2,14 +2,14 @@
 
 #include "console.hh"
 
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "command.hh" // idents, identflags
 #include "main.hh"
 #include "octaedit.hh" // editmode
 #include "rendertext.hh"
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 static void resetcomplete();
 static void complete(char *s, int maxlen, const char *cmdprefix);
 

src/engine/dynlight.cc

@@ -1,14 +1,14 @@
 #include "dynlight.hh"
 
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "main.hh" // timings
 #include "physics.hh" // collide
 #include "pvs.hh"
 #include "rendergl.hh" // camera1
 #include "renderva.hh"
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 VARNP(dynlights, usedynlights, 0, 1, 1);
 VARP(dynlightdist, 0, 1024, 10000);
 

src/engine/grass.cc

@@ -1,12 +1,12 @@
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "blend.hh"
 #include "main.hh" // timings
 #include "rendergl.hh" // xtraverts
 #include "renderva.hh"
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 VARP(grass, 0, 1, 1);
 VAR(dbggrass, 0, 0, 1);
 VARP(grassdist, 0, 256, 10000);

src/engine/light.cc

@@ -1,5 +1,8 @@
 #include "light.hh"
 
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "console.hh" /* conoutf */
 #include "main.hh" // renderbackground, player
@@ -11,9 +14,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 CVAR1R(ambient, 0x191919);
 FVARR(ambientscale, 0, 1, 16);
 

src/engine/main.cc

@@ -2,6 +2,10 @@
 
 #include "main.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "command.hh" // checksleep, writecfg
 #include "console.hh"
@@ -19,10 +23,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 static SDL_Window *screen = NULL;
 static int curvsync = -1;
 

src/engine/material.cc

@@ -1,4 +1,8 @@
 #include "material.hh"
+
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "octaedit.hh" // editmode
 #include "octarender.hh"
 #include "rendergl.hh"
@@ -8,9 +12,6 @@
 #include "water.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];
 
 struct QuadNode

src/engine/movie.cc

@@ -9,14 +9,14 @@
 
 #include "movie.hh"
 
+#include <shared/command.hh>
+
 #include "console.hh" /* conoutf */
 #include "main.hh"
 #include "rendergl.hh"
 #include "rendertext.hh"
 #include "texture.hh"
 
-#include <shared/cube.hh>
-
 VAR(dbgmovie, 0, 0, 1);
 
 struct aviindexentry

src/engine/normal.cc

@@ -1,11 +1,11 @@
+#include <shared/command.hh>
+
 #include "light.hh"
 #include "main.hh" // renderprogress
 #include "octarender.hh"
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-
 struct normalkey
 {
     vec pos;

src/engine/octa.cc

@@ -2,6 +2,9 @@
 
 #include "octa.hh"
 
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "console.hh" /* conoutf */
 #include "light.hh"
 #include "main.hh" // renderprogress, timings
@@ -9,9 +12,6 @@
 #include "octarender.hh"
 #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
 {
     { 2, 1, 6, 5 },

src/engine/octaedit.cc

@@ -1,5 +1,9 @@
 #include "octaedit.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "command.hh"
 #include "console.hh" /* conoutf */
@@ -16,10 +20,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 extern int outline;
 
 bool boxoutline = false;

src/engine/octarender.cc

@@ -2,6 +2,10 @@
 
 #include "octarender.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "console.hh" /* conoutf */
 #include "grass.hh"
@@ -16,10 +20,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 struct vboinfo
 {
     int uses;

src/engine/physics.cc

@@ -5,6 +5,10 @@
 
 #include "physics.hh"
 
+#include <shared/command.hh>
+#include <shared/ents.hh>
+#include <shared/igame.hh>
+
 #include "console.hh" /* conoutf */
 #include "main.hh" // player, timings
 #include "rendergl.hh" // camera1
@@ -12,10 +16,6 @@
 #include "octa.hh"
 #include "world.hh"
 
-#include <shared/ents.hh>
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 #include "mpr.hh"
 
 const int MAXCLIPOFFSET = 4;

src/engine/pvs.cc

@@ -1,5 +1,7 @@
 #include "pvs.hh"
 
+#include <shared/command.hh>
+
 #include "console.hh" /* conoutf */
 #include "main.hh" // numcpus, interceptkey, renderbackground
 #include "octa.hh"
@@ -7,8 +9,6 @@
 #include "rendergl.hh" // camera1
 #include "world.hh"
 
-#include <shared/cube.hh>
-
 enum
 {
     PVS_HIDE_GEOM = 1<<0,

src/engine/rendergl.cc

@@ -1,8 +1,12 @@
 // rendergl.cpp: core opengl rendering stuff
 
+#include "rendergl.hh"
+
 #include <ctime>
 
-#include <shared/gl.hh>
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
 
 #include "aa.hh"
 #include "blend.hh"
@@ -14,7 +18,6 @@
 #include "octaedit.hh"
 #include "octarender.hh" // valist
 #include "physics.hh" // movecamera
-#include "rendergl.hh"
 #include "renderlights.hh"
 #include "rendermodel.hh"
 #include "renderparticles.hh"
@@ -24,10 +27,6 @@
 #include "texture.hh"
 #include "water.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0);
 
 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;

src/engine/renderlights.cc

@@ -1,5 +1,9 @@
 #include "renderlights.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "aa.hh"
 #include "dynlight.hh"
 #include "light.hh"
@@ -17,10 +21,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 #define CHANGE_SHADERS 0
 
 int gw = -1, gh = -1, bloomw = -1, bloomh = -1, lasthdraccum = 0;

src/engine/rendermodel.cc

@@ -1,5 +1,9 @@
 #include "rendermodel.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "aa.hh"
 #include "command.hh" // identflags
 #include "console.hh" /* conoutf */
@@ -12,10 +16,6 @@
 #include "shader.hh"
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 VAR(oqdynent, 0, 1, 1);
 VAR(animationinterpolationtime, 0, 200, 1000);
 

src/engine/renderparticles.cc

@@ -1,5 +1,9 @@
 // renderparticles.cpp
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "console.hh" /* conoutf */
 #include "main.hh" // initing, minimized, loadprogress, timings
 #include "renderparticles.hh"
@@ -16,10 +20,6 @@
 #include "water.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.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);
 void particle_splash(int type, int num, int fade, const vec &p, int color = 0xFFFFFF, float size = 1.0f, int radius = 150, int gravity = 2);

src/engine/rendersky.cc

@@ -1,3 +1,6 @@
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "console.hh" /* conoutf */
 #include "light.hh"
 #include "main.hh" // timings
@@ -8,9 +11,6 @@
 #include "renderva.hh"
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
 
 static void loadsky(const char *basename, Texture *texs[6])

src/engine/rendertext.cc

@@ -1,12 +1,12 @@
 #include "rendertext.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "main.hh" // fatal, totalmillis
 #include "rendergl.hh" // xtraverts
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 static hashnameset<font> fonts;
 static font *fontdef = NULL;
 static int fontdeftex = 0;

src/engine/renderva.cc

@@ -2,6 +2,10 @@
 
 #include "renderva.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "grass.hh"
 #include "main.hh" // renderprogress, timings
@@ -15,10 +19,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
 {
     glDrawRangeElements_(GL_TRIANGLES, minvert, maxvert, numindices, GL_UNSIGNED_SHORT, indices);

src/engine/shader.cc

@@ -2,6 +2,9 @@
 
 #include "shader.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "command.hh" // identflags
 #include "console.hh" /* conoutf */
 #include "main.hh" // loadprogress, renderprogress, fatal
@@ -10,9 +13,6 @@
 #include "rendermodel.hh" // cleanupmodels
 #include "texture.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 Shader *Shader::lastshader = NULL;
 
 Shader *nullshader = NULL, *hudshader = NULL, *hudtextshader = NULL, *hudnotextureshader = NULL, *nocolorshader = NULL, *foggedshader = NULL, *foggednotextureshader = NULL, *ldrshader = NULL, *ldrnotextureshader = NULL, *stdworldshader = NULL;

src/engine/stain.cc

@@ -1,5 +1,9 @@
 #include "stain.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "console.hh" /* conoutf */
 #include "main.hh" // initing, loadprogress, timings
 #include "material.hh"
@@ -9,10 +13,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
-
 struct stainvert
 {
     vec pos;

src/engine/texture.cc

@@ -1,8 +1,11 @@
 // texture.cpp: texture slot management
 
+#include "texture.hh"
+
 #include <ctime>
 
-#include "texture.hh"
+#include <shared/command.hh>
+#include <shared/igame.hh>
 
 #include "command.hh" // identflags
 #include "console.hh" /* conoutf */
@@ -16,9 +19,6 @@
 #include "shader.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/igame.hh>
-
 #ifdef __APPLE__
   #include "SDL2_image/SDL_image.h"
 #else

src/engine/water.cc

@@ -1,5 +1,8 @@
 #include "water.hh"
 
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+
 #include "main.hh" // timings
 #include "material.hh"
 #include "octarender.hh"
@@ -7,9 +10,6 @@
 #include "texture.hh"
 #include "world.hh"
 
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-
 extern const vec matnormals[6];
 
 extern vector<materialsurface> watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];

src/engine/world.cc

@@ -1,5 +1,11 @@
 // world.cpp: core map management stuff
 
+#include "world.hh"
+
+#include <shared/command.hh>
+#include <shared/glemu.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "command.hh"
 #include "console.hh" /* conoutf */
@@ -17,11 +23,6 @@
 #include "stain.hh"
 #include "texture.hh"
 #include "worldio.hh"
-#include "world.hh"
-
-#include <shared/cube.hh>
-#include <shared/glemu.hh>
-#include <shared/igame.hh>
 
 VARNR(mapscale, worldscale, 1, 0, 0);
 VARNR(mapsize, worldsize, 1, 0, 0);

src/engine/worldio.cc

@@ -1,5 +1,10 @@
 // worldio.cpp: loading & saving of maps and savegames
 
+#include "worldio.hh"
+
+#include <shared/command.hh>
+#include <shared/igame.hh>
+
 #include "blend.hh"
 #include "command.hh" // idents, identflags
 #include "console.hh" /* conoutf */
@@ -11,10 +16,6 @@
 #include "rendermodel.hh" // loadmapmodel, getmminfo, flushpreloadedmodels
 #include "texture.hh"
 #include "world.hh"
-#include "worldio.hh"
-
-#include <shared/cube.hh>
-#include <shared/igame.hh>
 
 #define OCTAVERSION 33
 

src/engine/worldio.hh

@@ -1,6 +1,8 @@
 #ifndef ENGINE_WORLDIO_HH
 #define ENGINE_WORLDIO_HH
 
+#include <shared/tools.hh>
+
 uint getmapcrc();
 void clearmapcrc();
 bool load_world(const char *mname, const char *cname = NULL);

src/game/game.cc

@@ -1,4 +1,4 @@
-#include "cube.hh"
+#include <shared/command.hh>
 
 #include <engine/main.hh>
 #include <engine/octaedit.hh>

src/shared/cube.hh

@@ -1,6 +0,0 @@
-#ifndef __CUBE_H__
-#define __CUBE_H__
-
-#include "command.hh"
-
-#endif

src/shared/igame.hh

@@ -3,6 +3,7 @@
 struct entity;
 struct extentity;
 struct physent;
+struct dynent;
 struct selinfo;
 struct VSlot;
 

src/shared/stream.cc

@@ -1,6 +1,6 @@
-#include <engine/console.hh> /* conoutf */
+#include "command.hh"
 
-#include "cube.hh"
+#include <engine/console.hh> /* conoutf */
 
 ///////////////////////// character conversion ///////////////
 

src/shared/tools.cc

@@ -1,8 +1,8 @@
 // implementation of generic tools
 
-#include <ctime>
+#include "tools.hh"
 
-#include "cube.hh"
+#include <ctime>
 
 void *operator new(size_t size)
 {

src/shared/zip.cc

@@ -1,6 +1,6 @@
-#include <engine/console.hh> /* conoutf */
+#include "command.hh"
 
-#include "cube.hh"
+#include <engine/console.hh> /* conoutf */
 
 enum
 {