From e6be9231c993cff305b6e5f7250cba696c9f2700 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 9 Nov 2019 11:18:52 +0100 Subject: [PATCH] noGUI taken into account in more places --- 3d-models.cpp | 2 +- floorshapes.cpp | 1 + raycaster.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/3d-models.cpp b/3d-models.cpp index aa19e35c..2c8b0ad3 100644 --- a/3d-models.cpp +++ b/3d-models.cpp @@ -834,7 +834,7 @@ void geometry_information::make_shadow(hpcshape& sh) { } void geometry_information::make_3d_models() { - if(GDIM == 2) return; + if(GDIM == 2 || noGUI) return; eyepos = WDIM == 2 ? 0.875 : 0.925; DEBBI(DF_POLY, ("make_3d_models")); shcenter = C0; diff --git a/floorshapes.cpp b/floorshapes.cpp index 6b9173fa..79c3eed3 100644 --- a/floorshapes.cpp +++ b/floorshapes.cpp @@ -1069,6 +1069,7 @@ void geometry_information::make_floor_textures_here() { } EX void make_floor_textures() { + if(noGUI || !vid.usingGL) return; DEBBI(DF_POLY, ("make_floor_textures")); dynamicval g(geometry, gEuclidSquare); dynamicval gm(pmodel, mdDisk); diff --git a/raycaster.cpp b/raycaster.cpp index c9b3cf09..aa2b48ef 100644 --- a/raycaster.cpp +++ b/raycaster.cpp @@ -59,6 +59,8 @@ eGeometry last_geometry; /** is the raycaster available? */ EX bool available() { + if(noGUI) return false; + if(!vid.usingGL) return false; if(WDIM == 2) return false; if(hyperbolic && pmodel == mdPerspective && !penrose) return true;