diff --git a/src/engine/blend.cc b/src/engine/blend.cc index 3aaf397..33469eb 100644 --- a/src/engine/blend.cc +++ b/src/engine/blend.cc @@ -2,7 +2,7 @@ #include "console.hh" /* conoutf */ #include "light.hh" -#include "main.hh" // multiplayer +#include "main.hh" // multiplayer, timings #include "octaedit.hh" #include "rendergl.hh" /* has*, worldpos */ #include "renderva.hh" diff --git a/src/engine/command.cc b/src/engine/command.cc index 0c34e3a..a9c90ad 100644 --- a/src/engine/command.cc +++ b/src/engine/command.cc @@ -4,7 +4,7 @@ #include "command.hh" #include "console.hh" -#include "main.hh" // fatal +#include "main.hh" // fatal, timings #include diff --git a/src/engine/dynlight.cc b/src/engine/dynlight.cc index 22b20d0..4d80c97 100644 --- a/src/engine/dynlight.cc +++ b/src/engine/dynlight.cc @@ -1,5 +1,6 @@ #include "dynlight.hh" +#include "main.hh" // timings #include "physics.hh" // collide #include "pvs.hh" #include "rendergl.hh" // camera1 diff --git a/src/engine/grass.cc b/src/engine/grass.cc index 660e8d3..76862be 100644 --- a/src/engine/grass.cc +++ b/src/engine/grass.cc @@ -1,4 +1,5 @@ #include "blend.hh" +#include "main.hh" // timings #include "rendergl.hh" // xtraverts #include "renderva.hh" #include "texture.hh" diff --git a/src/engine/main.hh b/src/engine/main.hh index f2c5c44..469ec31 100644 --- a/src/engine/main.hh +++ b/src/engine/main.hh @@ -10,6 +10,11 @@ extern bool minimized; extern float loadprogress; extern bool inbetweenframes, renderedframe; +extern int curtime; // current frame time +extern int lastmillis; // last time +extern int elapsedtime; // elapsed frame time +extern int totalmillis; // total elapsed time + struct dynent; extern dynent *player; diff --git a/src/engine/movie.cc b/src/engine/movie.cc index a8e8362..7315537 100644 --- a/src/engine/movie.cc +++ b/src/engine/movie.cc @@ -10,7 +10,7 @@ #include "movie.hh" #include "console.hh" /* conoutf */ -#include "main.hh" // getfps, getclockmillis, screenw/h, inbetweenframes, renderedframe +#include "main.hh" #include "rendergl.hh" #include "rendertext.hh" #include "texture.hh" diff --git a/src/engine/octa.cc b/src/engine/octa.cc index 15fa7fb..3ae9a6e 100644 --- a/src/engine/octa.cc +++ b/src/engine/octa.cc @@ -4,7 +4,7 @@ #include "console.hh" /* conoutf */ #include "light.hh" -#include "main.hh" // renderprogress +#include "main.hh" // renderprogress, timings #include "octaedit.hh" #include "octarender.hh" #include "world.hh" diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc index 1a8397c..cbc5e43 100644 --- a/src/engine/octaedit.cc +++ b/src/engine/octaedit.cc @@ -3,7 +3,7 @@ #include "blend.hh" #include "console.hh" /* conoutf */ #include "light.hh" -#include "main.hh" // mainmenu, keyrepeat, renderedframe, player, isconnected, multiplayer +#include "main.hh" #include "material.hh" #include "octa.hh" #include "octarender.hh" diff --git a/src/engine/physics.cc b/src/engine/physics.cc index cf27d7d..f201668 100644 --- a/src/engine/physics.cc +++ b/src/engine/physics.cc @@ -6,7 +6,7 @@ #include "physics.hh" #include "console.hh" /* conoutf */ -#include "main.hh" // player +#include "main.hh" // player, timings #include "rendergl.hh" // camera1 #include "rendermodel.hh" #include "octa.hh" diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc index 9166f35..f8ee0bf 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, player, fatal +#include "main.hh" #include "material.hh" #include "pvs.hh" #include "octaedit.hh" diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc index 9967f12..4f267df 100644 --- a/src/engine/renderlights.cc +++ b/src/engine/renderlights.cc @@ -3,7 +3,7 @@ #include "aa.hh" #include "dynlight.hh" #include "light.hh" -#include "main.hh" // initwarning, fatal +#include "main.hh" // initwarning, fatal, timings #include "material.hh" #include "octaedit.hh" // editmode #include "octarender.hh" diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc index 854c804..66ffe2e 100644 --- a/src/engine/rendermodel.cc +++ b/src/engine/rendermodel.cc @@ -3,7 +3,7 @@ #include "aa.hh" #include "command.hh" // identflags #include "console.hh" /* conoutf */ -#include "main.hh" // loadprogress, renderprogress +#include "main.hh" // loadprogress, renderprogress, timings #include "octarender.hh" #include "physics.hh" // collidewall #include "pvs.hh" diff --git a/src/engine/renderparticles.cc b/src/engine/renderparticles.cc index 4d097d0..a64c9bf 100644 --- a/src/engine/renderparticles.cc +++ b/src/engine/renderparticles.cc @@ -1,7 +1,7 @@ // renderparticles.cpp #include "console.hh" /* conoutf */ -#include "main.hh" // initing, minimized, loadprogress +#include "main.hh" // initing, minimized, loadprogress, timings #include "renderparticles.hh" #include "octaedit.hh" // editmode #include "octarender.hh" diff --git a/src/engine/rendersky.cc b/src/engine/rendersky.cc index 55ca1b5..32237ab 100644 --- a/src/engine/rendersky.cc +++ b/src/engine/rendersky.cc @@ -1,5 +1,6 @@ #include "console.hh" /* conoutf */ #include "light.hh" +#include "main.hh" // timings #include "octaedit.hh" // editmode #include "octarender.hh" #include "rendergl.hh" diff --git a/src/engine/rendertext.cc b/src/engine/rendertext.cc index 859a280..093c86e 100644 --- a/src/engine/rendertext.cc +++ b/src/engine/rendertext.cc @@ -1,6 +1,6 @@ #include "rendertext.hh" -#include "main.hh" // fatal +#include "main.hh" // fatal, totalmillis #include "rendergl.hh" // xtraverts #include "texture.hh" diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc index 912b593..3526cc7 100644 --- a/src/engine/renderva.cc +++ b/src/engine/renderva.cc @@ -4,7 +4,7 @@ #include "blend.hh" #include "grass.hh" -#include "main.hh" // renderprogress +#include "main.hh" // renderprogress, timings #include "octaedit.hh" // editmode #include "octarender.hh" #include "pvs.hh" diff --git a/src/engine/stain.cc b/src/engine/stain.cc index 1e7ad74..a0770c5 100644 --- a/src/engine/stain.cc +++ b/src/engine/stain.cc @@ -1,7 +1,7 @@ #include "stain.hh" #include "console.hh" /* conoutf */ -#include "main.hh" // initing, loadprogress +#include "main.hh" // initing, loadprogress, timings #include "material.hh" #include "rendergl.hh" #include "renderlights.hh" diff --git a/src/engine/water.cc b/src/engine/water.cc index 9639f93..38e478c 100644 --- a/src/engine/water.cc +++ b/src/engine/water.cc @@ -1,5 +1,6 @@ #include "water.hh" +#include "main.hh" // timings #include "material.hh" #include "octarender.hh" #include "rendergl.hh" diff --git a/src/game/game.cc b/src/game/game.cc index b350036..bef6bfa 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -1,5 +1,6 @@ #include "cube.hh" +#include #include #include #include diff --git a/src/shared/iengine.hh b/src/shared/iengine.hh index 90f7140..589aad4 100644 --- a/src/shared/iengine.hh +++ b/src/shared/iengine.hh @@ -1,11 +1,3 @@ -// the interface the game uses to access the engine - -extern int curtime; // current frame time -extern int lastmillis; // last time -extern int elapsedtime; // elapsed frame time -extern int totalmillis; // total elapsed time -extern int gamespeed, paused; - // command extern int variable(const char *name, int min, int cur, int max, int *storage, identfun fun, int flags); extern float fvariable(const char *name, float min, float cur, float max, float *storage, identfun fun, int flags);