player goes in main

src/engine/engine.hh

@@ -5,7 +5,6 @@
 #include "world.hh"
 #include "light.hh"
 
-extern dynent *player;
 extern physent *camera1;                // special ent that acts as camera, same object as player1 in FPS mode
 
 #endif

src/engine/light.cc

@@ -1,6 +1,6 @@
 #include "blend.hh"
 #include "console.hh" /* conoutf */
-#include "main.hh" // renderbackground
+#include "main.hh" // renderbackground, player
 #include "octa.hh"
 #include "octaedit.hh" // commitchanges
 #include "octarender.hh"

src/engine/main.hh

@@ -10,6 +10,9 @@ extern bool minimized;
 extern float loadprogress;
 extern bool inbetweenframes, renderedframe;
 
+struct dynent;
+extern dynent *player;
+
 void clearmainmenu();
 
 enum

src/engine/octaedit.cc

@@ -2,7 +2,7 @@
 
 #include "blend.hh"
 #include "console.hh" /* conoutf */
-#include "main.hh" // mainmenu, keyrepeat, renderedframe
+#include "main.hh" // mainmenu, keyrepeat, renderedframe, player
 #include "material.hh"
 #include "octa.hh"
 #include "octarender.hh"

src/engine/physics.cc

@@ -6,6 +6,7 @@
 #include "physics.hh"
 
 #include "console.hh" /* conoutf */
+#include "main.hh" // player
 #include "rendermodel.hh"
 #include "octa.hh"
 #include "world.hh"

src/engine/rendergl.cc

@@ -4,7 +4,7 @@
 #include "blend.hh"
 #include "console.hh"
 #include "grass.hh"
-#include "main.hh" // mainmenu, renderbackground, getfps, getclockmillis, screenw/h, inbetweenframes, renderedframe
+#include "main.hh" // mainmenu, renderbackground, getfps, getclockmillis, screenw/h, inbetweenframes, renderedframe, player
 #include "material.hh"
 #include "pvs.hh"
 #include "octaedit.hh"

src/engine/world.cc

@@ -3,7 +3,7 @@
 #include "blend.hh"
 #include "command.hh"
 #include "console.hh" /* conoutf */
-#include "main.hh" // clearmainmenu
+#include "main.hh" // clearmainmenu, player
 #include "octa.hh"
 #include "octaedit.hh"
 #include "octarender.hh"