mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-03-30 07:17:03 +00:00
Code Issues Releases Wiki Activity

more guards

Browse Source
This commit is contained in:
Zeno Rogue 2020-08-03 23:25:08 +02:00
parent a49b10d2ad
commit 8173fc0504
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drawing.cpp
View File

@ -1999,7 +1999,9 @@ void dqi_line::draw_back() {
EX void sort_drawqueue() { EX void sort_drawqueue() {
#if MAXMDIM >= 4 && CAP_GL
if(WDIM == 2 && GDIM == 3 && hyperbolic) make_air(); if(WDIM == 2 && GDIM == 3 && hyperbolic) make_air();
#endif
DEBBI(DF_GRAPH, ("sort_drawqueue")); DEBBI(DF_GRAPH, ("sort_drawqueue"));

4
mapeditor.cpp
View File

@ -430,6 +430,7 @@ EX namespace mapstream {
else else
return dir; return dir;
} }
#endif
EX void save_geometry(hstream& f) { EX void save_geometry(hstream& f) {
f.write(geometry); f.write(geometry);
@ -599,7 +600,8 @@ EX namespace mapstream {
if(vernum >= 0xA810) if(vernum >= 0xA810)
f.read(mine_adjacency_rule); f.read(mine_adjacency_rule);
} }
#if CAP_EDIT
void save_only_map(fhstream& f) { void save_only_map(fhstream& f) {
f.write(patterns::whichPattern); f.write(patterns::whichPattern);
save_geometry(f); save_geometry(f);

2
shaders.cpp
View File

@ -409,6 +409,7 @@ void display_data::set_projection(int ed, ld shift) {
} }
#endif #endif
#if MAXMDIM >= 4
if(selected->tAirMap != -1) { if(selected->tAirMap != -1) {
glActiveTexture(GL_TEXTURE0 + AIR_BINDING); glActiveTexture(GL_TEXTURE0 + AIR_BINDING);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -418,6 +419,7 @@ void display_data::set_projection(int ed, ld shift) {
glActiveTexture(GL_TEXTURE0 + 0); glActiveTexture(GL_TEXTURE0 + 0);
glUniformMatrix4fv(selected->uRadarTransform, 1, 0, glhr::tmtogl_transpose3(radar_transform).as_array()); glUniformMatrix4fv(selected->uRadarTransform, 1, 0, glhr::tmtogl_transpose3(radar_transform).as_array());
} }
#endif
if(selected->uIterations != -1) { if(selected->uIterations != -1) {
glhr::set_index_sl(0); glhr::set_index_sl(0);