diff --git a/src/engine/bih.cc b/src/engine/bih.cc index ce97823..e25ca15 100644 --- a/src/engine/bih.cc +++ b/src/engine/bih.cc @@ -1,5 +1,4 @@ -#include - +#include "ents.hh" #include "physics.hh" #include "rendermodel.hh" // loadmapmodel #include "stain.hh" diff --git a/src/shared/ents.hh b/src/engine/ents.hh similarity index 99% rename from src/shared/ents.hh rename to src/engine/ents.hh index fa4e748..c7096c2 100644 --- a/src/shared/ents.hh +++ b/src/engine/ents.hh @@ -1,5 +1,5 @@ -#ifndef SHARED_ENTS_HH -#define SHARED_ENTS_HH +#ifndef ENGINE_ENTS_HH +#define ENGINE_ENTS_HH #include "tools.hh" #include "geom.hh" diff --git a/src/engine/octa.hh b/src/engine/octa.hh index bcaf53b..5ecf69c 100644 --- a/src/engine/octa.hh +++ b/src/engine/octa.hh @@ -3,7 +3,8 @@ #include #include -#include + +#include "ents.hh" struct vertex { vec pos; bvec4 norm; vec tc; bvec4 tangent; }; diff --git a/src/engine/physics.cc b/src/engine/physics.cc index c3f13f9..2bd7047 100644 --- a/src/engine/physics.cc +++ b/src/engine/physics.cc @@ -6,10 +6,10 @@ #include "physics.hh" #include -#include #include #include "console.hh" /* conoutf */ +#include "ents.hh" #include "main.hh" // player, timings #include "rendergl.hh" // camera1 #include "rendermodel.hh" diff --git a/src/engine/world.hh b/src/engine/world.hh index 4679a04..64cc33b 100644 --- a/src/engine/world.hh +++ b/src/engine/world.hh @@ -2,7 +2,6 @@ #define ENGINE_WORLD_HH #include -#include /* FIXME: move these defines/enums */