From 10bd470b40a457a77d508ae48a99ff3132ed99fd Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 23 Jun 2020 00:25:05 +0200 Subject: [PATCH] xtraverts goes in rendergl.hh --- src/engine/engine.hh | 1 - src/engine/grass.cc | 1 + src/engine/rendergl.hh | 2 ++ src/engine/rendertext.cc | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/engine.hh b/src/engine/engine.hh index fa1b9d3..4f2b76f 100644 --- a/src/engine/engine.hh +++ b/src/engine/engine.hh @@ -9,6 +9,5 @@ extern dynent *player; extern physent *camera1; // special ent that acts as camera, same object as player1 in FPS mode extern int worldscale, worldsize; -extern int xtraverts, xtravertsva; #endif diff --git a/src/engine/grass.cc b/src/engine/grass.cc index c2a2276..b27d635 100644 --- a/src/engine/grass.cc +++ b/src/engine/grass.cc @@ -1,4 +1,5 @@ #include "blend.hh" +#include "rendergl.hh" // xtraverts #include "renderva.hh" #include "texture.hh" diff --git a/src/engine/rendergl.hh b/src/engine/rendergl.hh index 76dd22c..7ec6b9c 100644 --- a/src/engine/rendergl.hh +++ b/src/engine/rendergl.hh @@ -5,6 +5,8 @@ extern bool hasVAO, hasTR, hasTSW, hasPBO, hasFBO, hasAFBO, hasDS, hasTF, hasCBF, hasS3TC, hasFXT1, hasLATC, hasRGTC, hasAF, hasFBB, hasFBMS, hasTMS, hasMSS, hasFBMSBS, hasUBO, hasMBR, hasDB2, hasDBB, hasTG, hasTQ, hasPF, hasTRG, hasTI, hasHFV, hasHFP, hasDBT, hasDC, hasDBGO, hasEGPU4, hasGPU4, hasGPU5, hasBFE, hasEAL, hasCR, hasOQ2, hasES3, hasCB, hasCI; +extern int xtraverts, xtravertsva; + extern int renderw, renderh, hudw, hudh; extern int glversion, glslversion, glcompat; diff --git a/src/engine/rendertext.cc b/src/engine/rendertext.cc index 4d30d1f..2cf02b2 100644 --- a/src/engine/rendertext.cc +++ b/src/engine/rendertext.cc @@ -1,4 +1,6 @@ #include "rendertext.hh" + +#include "rendergl.hh" // xtraverts #include "texture.hh" #include "engine.hh"