From eb152e584e8a0b4558c218877a7c4971c81e56e1 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 23 Jun 2020 00:30:39 +0200 Subject: [PATCH] player goes in main --- src/engine/engine.hh | 1 - src/engine/light.cc | 2 +- src/engine/main.hh | 3 +++ src/engine/octaedit.cc | 2 +- src/engine/physics.cc | 1 + src/engine/rendergl.cc | 2 +- src/engine/world.cc | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/engine/engine.hh b/src/engine/engine.hh index fe219af..0ce8cee 100644 --- a/src/engine/engine.hh +++ b/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 diff --git a/src/engine/light.cc b/src/engine/light.cc index 588a800..ec8df7a 100644 --- a/src/engine/light.cc +++ b/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" diff --git a/src/engine/main.hh b/src/engine/main.hh index bf5a26b..4acb337 100644 --- a/src/engine/main.hh +++ b/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 diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc index 857445c..551097c 100644 --- a/src/engine/octaedit.cc +++ b/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" diff --git a/src/engine/physics.cc b/src/engine/physics.cc index 1fbb815..a37a09c 100644 --- a/src/engine/physics.cc +++ b/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" diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc index 43ddb93..b496a82 100644 --- a/src/engine/rendergl.cc +++ b/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" diff --git a/src/engine/world.cc b/src/engine/world.cc index 6c9c1a0..57da951 100644 --- a/src/engine/world.cc +++ b/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"