1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-16 02:09:59 +00:00

more guards cont.

This commit is contained in:
Zeno Rogue 2020-07-03 14:48:36 +02:00
parent f09ed715f1
commit f3c35de400
6 changed files with 9 additions and 4 deletions

View File

@ -220,6 +220,7 @@ void setcameraangle(bool b) { }
EX void reset_projection() { } EX void reset_projection() { }
EX void glflush() { } EX void glflush() { }
EX bool model_needs_depth() { return false; } EX bool model_needs_depth() { return false; }
void display_data::set_all(int ed) {}
#endif #endif
#if CAP_GL #if CAP_GL

View File

@ -1116,6 +1116,7 @@ EX namespace s2xe {
} }
} }
#if CAP_GL
void draw_s2xe(dqi_poly *p) { void draw_s2xe(dqi_poly *p) {
if(!p->cnt) return; if(!p->cnt) return;
if(p->flags & POLY_TRIANGLES) { if(p->flags & POLY_TRIANGLES) {
@ -1157,6 +1158,7 @@ void draw_s2xe(dqi_poly *p) {
} }
else draw_s2xe0(p); else draw_s2xe0(p);
} }
#endif
struct point_data { struct point_data {
hyperpoint direction; hyperpoint direction;
@ -1165,6 +1167,7 @@ struct point_data {
int bad; int bad;
}; };
#if CAP_GL
void draw_s2xe0(dqi_poly *p) { void draw_s2xe0(dqi_poly *p) {
if(!p->cnt) return; if(!p->cnt) return;
dqi_poly npoly = *p; dqi_poly npoly = *p;
@ -1244,6 +1247,7 @@ void draw_s2xe0(dqi_poly *p) {
npoly.gldraw(); npoly.gldraw();
} }
} }
#endif
EX } EX }
EX namespace ods { EX namespace ods {

View File

@ -1084,7 +1084,7 @@ EX void check_cgi() {
floor_textures = NULL; floor_textures = NULL;
} }
#if MAXMDIM >= 4 #if MAXMDIM >= 4 && CAP_GL
if(!floor_textures && GDIM == 3 && (cgi.state & 2)) if(!floor_textures && GDIM == 3 && (cgi.state & 2))
make_floor_textures(); make_floor_textures();
#endif #endif

View File

@ -4884,7 +4884,7 @@ EX void drawfullmap() {
draw_boundary(1); draw_boundary(1);
draw_model_elements(); draw_model_elements();
#if MAXMDIM >= 4 #if MAXMDIM >= 4 && CAP_GL
prepare_sky(); prepare_sky();
#endif #endif
#endif #endif

View File

@ -1141,7 +1141,7 @@ void geometry_information::configure_floorshapes() {
void geometry_information::prepare_shapes() { void geometry_information::prepare_shapes() {
require_basics(); require_basics();
if(cgflags & qRAYONLY) return; if(cgflags & qRAYONLY) return;
#if MAXMDIM >= 4 #if MAXMDIM >= 4 && CAP_GL
if(GDIM == 3 && !floor_textures) make_floor_textures(); if(GDIM == 3 && !floor_textures) make_floor_textures();
#endif #endif

View File

@ -2,8 +2,8 @@
namespace hr { namespace hr {
#if MAXMDIM >= 4 && CAP_GL
EX ld camera_level; EX ld camera_level;
#if MAXMDIM >= 4 && CAP_GL
EX int get_skybrightness(int mul IS(1)) { EX int get_skybrightness(int mul IS(1)) {
ld s = 1 - mul * (camera_level - cgi.WALL) / -2; ld s = 1 - mul * (camera_level - cgi.WALL) / -2;