From 5e77f4527359213a91e00f41a8a68f3437bfae75 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Jun 2020 00:36:12 +0200
Subject: [PATCH] remove light.hh include from engine.hh

---
 src/engine/blend.cc        |  2 ++
 src/engine/engine.hh       |  1 -
 src/engine/light.cc        |  2 ++
 src/engine/light.hh        | 11 +++++++++++
 src/engine/normal.cc       |  1 +
 src/engine/octa.cc         |  1 +
 src/engine/octaedit.cc     |  1 +
 src/engine/octarender.cc   |  1 +
 src/engine/renderlights.cc |  1 +
 src/engine/rendersky.cc    |  1 +
 src/engine/texture.cc      |  1 +
 src/engine/world.cc        |  1 +
 12 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/engine/blend.cc b/src/engine/blend.cc
index 2137884..291819b 100644
--- a/src/engine/blend.cc
+++ b/src/engine/blend.cc
@@ -1,5 +1,7 @@
 #include "blend.hh"
+
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "octaedit.hh"
 #include "rendergl.hh" /* has* */
 #include "renderva.hh"
diff --git a/src/engine/engine.hh b/src/engine/engine.hh
index 76fd9f4..f71ea5d 100644
--- a/src/engine/engine.hh
+++ b/src/engine/engine.hh
@@ -3,6 +3,5 @@
 
 #include "cube.hh"
 #include "world.hh"
-#include "light.hh"
 
 #endif
diff --git a/src/engine/light.cc b/src/engine/light.cc
index ec8df7a..54b9330 100644
--- a/src/engine/light.cc
+++ b/src/engine/light.cc
@@ -1,3 +1,5 @@
+#include "light.hh"
+
 #include "blend.hh"
 #include "console.hh" /* conoutf */
 #include "main.hh" // renderbackground, player
diff --git a/src/engine/light.hh b/src/engine/light.hh
index 304c783..0f4ecaf 100644
--- a/src/engine/light.hh
+++ b/src/engine/light.hh
@@ -1,3 +1,13 @@
+/* TODO: cleanup */
+
+#ifndef ENGINE_LIGHT_HH
+#define ENGINE_LIGHT_HH
+
+#include <shared/tools.hh>
+#include <shared/geom.hh>
+
+#include "octa.hh"
+
 struct PackNode
 {
     PackNode *child1, *child2;
@@ -84,3 +94,4 @@ extern void check_calclight_canceled();
 
 extern const vector<int> &checklightcache(int x, int y);
 
+#endif
diff --git a/src/engine/normal.cc b/src/engine/normal.cc
index 5d91cb0..98b34e7 100644
--- a/src/engine/normal.cc
+++ b/src/engine/normal.cc
@@ -1,3 +1,4 @@
+#include "light.hh"
 #include "main.hh" // renderprogress
 #include "octarender.hh"
 #include "texture.hh"
diff --git a/src/engine/octa.cc b/src/engine/octa.cc
index 5fd81ef..addb180 100644
--- a/src/engine/octa.cc
+++ b/src/engine/octa.cc
@@ -3,6 +3,7 @@
 #include "octa.hh"
 
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "main.hh" // renderprogress
 #include "octaedit.hh"
 #include "octarender.hh"
diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc
index 551097c..ce2f3d4 100644
--- a/src/engine/octaedit.cc
+++ b/src/engine/octaedit.cc
@@ -2,6 +2,7 @@
 
 #include "blend.hh"
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "main.hh" // mainmenu, keyrepeat, renderedframe, player
 #include "material.hh"
 #include "octa.hh"
diff --git a/src/engine/octarender.cc b/src/engine/octarender.cc
index 74a394b..4e1e01e 100644
--- a/src/engine/octarender.cc
+++ b/src/engine/octarender.cc
@@ -5,6 +5,7 @@
 #include "blend.hh"
 #include "console.hh" /* conoutf */
 #include "grass.hh"
+#include "light.hh"
 #include "main.hh" // mainmenu, laodprogress
 #include "material.hh"
 #include "rendergl.hh"
diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc
index 0b335f0..d488b03 100644
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@@ -2,6 +2,7 @@
 
 #include "aa.hh"
 #include "dynlight.hh"
+#include "light.hh"
 #include "main.hh" // initwarning
 #include "material.hh"
 #include "octaedit.hh" // editmode
diff --git a/src/engine/rendersky.cc b/src/engine/rendersky.cc
index 5710720..774d2d5 100644
--- a/src/engine/rendersky.cc
+++ b/src/engine/rendersky.cc
@@ -1,4 +1,5 @@
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "octaedit.hh" // editmode
 #include "octarender.hh"
 #include "rendergl.hh"
diff --git a/src/engine/texture.cc b/src/engine/texture.cc
index 6432952..0b06af0 100644
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@@ -4,6 +4,7 @@
 
 #include "command.hh" // identflags
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "main.hh" // initwarning, loadprogress, renderprogress, screenw/h, renderedframe
 #include "material.hh"
 #include "octaedit.hh"
diff --git a/src/engine/world.cc b/src/engine/world.cc
index 57da951..6e3a107 100644
--- a/src/engine/world.cc
+++ b/src/engine/world.cc
@@ -3,6 +3,7 @@
 #include "blend.hh"
 #include "command.hh"
 #include "console.hh" /* conoutf */
+#include "light.hh"
 #include "main.hh" // clearmainmenu, player
 #include "octa.hh"
 #include "octaedit.hh"