mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 05:17:17 +00:00
Code Issues Releases Wiki Activity

fixed compilation without CAP_EDIT and CAP_CONFIG

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-31 20:59:58 +02:00
parent 96175cd345
commit c08a6bf79a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.cpp
View File

@ -69,6 +69,7 @@ template<class T, class U, class V> void addsaver(T& i, U name, V dft) {
template<class T, class U> void addsaver(T& i, U name) {} template<class T, class U> void addsaver(T& i, U name) {}
template<class T, class U> void addsaverenum(T& i, U name) {} template<class T, class U> void addsaverenum(T& i, U name) {}
template<class T, class U> void addsaverenum(T& i, U name, T dft) {}
#endif #endif
void addsaver(charstyle& cs, string s) { void addsaver(charstyle& cs, string s) {

13
graph.cpp
View File

@ -574,7 +574,11 @@ bool drawstar(cell *c) {
} }
bool drawing_usershape_on(cell *c, mapeditor::eShapegroup sg) { bool drawing_usershape_on(cell *c, mapeditor::eShapegroup sg) {
#if CAP_EDIT
return c && c == mapeditor::drawcell && mapeditor::drawcellShapeGroup() == sg; return c && c == mapeditor::drawcell && mapeditor::drawcellShapeGroup() == sg;
#else
return false;
#endif
} }
bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks, bool hidden) { bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks, bool hidden) {
@ -3772,8 +3776,10 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
int flooralpha = 255; int flooralpha = 255;
#if CAP_EDIT
if((cmode & sm::DRAW) && mapeditor::drawcell && mapeditor::drawcellShapeGroup() == mapeditor::sgFloor) if((cmode & sm::DRAW) && mapeditor::drawcell && mapeditor::drawcellShapeGroup() == mapeditor::sgFloor)
flooralpha = 0xC0; flooralpha = 0xC0;
#endif
if(c->wall == waMagma) fd = 0; if(c->wall == waMagma) fd = 0;
@ -3800,14 +3806,13 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
// floor // floor
#if CAP_EDIT
auto si = patterns::getpatterninfo0(c);
#endif
bool eoh = euclid || !BITRUNCATED; bool eoh = euclid || !BITRUNCATED;
#if CAP_EDIT
auto si = patterns::getpatterninfo0(c);
if(drawing_usershape_on(c, mapeditor::sgFloor)) if(drawing_usershape_on(c, mapeditor::sgFloor))
mapeditor::drawtrans = V * applyPatterndir(c, si); mapeditor::drawtrans = V * applyPatterndir(c, si);
#endif
if(c->wall == waChasm) { if(c->wall == waChasm) {
zcol = 0; zcol = 0;