mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

added missing geometry guards to mapeditor

Browse Source
This commit is contained in:
?
2019-02-26 14:56:26 +01:00
committed by Zeno Rogue
parent b0c21f0626
commit cc98858aa0
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mapeditor.cpp
View File

@@ -100,10 +100,12 @@ namespace mapstream {
f.write(geometry); f.write(geometry);
char nbtype = char(variation); char nbtype = char(variation);
f.write(nbtype); f.write(nbtype);
#if CAP_GP
if(GOLDBERG) { if(GOLDBERG) {
f.write(gp::param.first); f.write(gp::param.first);
f.write(gp::param.second); f.write(gp::param.second);
} }
#endif
if(geometry == gTorus) { if(geometry == gTorus) {
f.write(torusconfig::qty); f.write(torusconfig::qty);
f.write(torusconfig::dx); f.write(torusconfig::dx);
@@ -112,6 +114,7 @@ namespace mapstream {
f.write(torusconfig::sdy); f.write(torusconfig::sdy);
f.write(torusconfig::torus_mode); f.write(torusconfig::torus_mode);
} }
#if CAP_FIELD
if(geometry == gFieldQuotient) { if(geometry == gFieldQuotient) {
using namespace fieldpattern; using namespace fieldpattern;
f.write(quotient_field_changed); f.write(quotient_field_changed);
@@ -120,12 +123,17 @@ namespace mapstream {
f.write(fgeomextras[current_extra].current_prime_id); f.write(fgeomextras[current_extra].current_prime_id);
} }
} }
#endif
#if CAP_CRYSTAL
if(geometry == gCrystal) { if(geometry == gCrystal) {
f.write(ginf[gCrystal].sides); f.write(ginf[gCrystal].sides);
if(ginf[gCrystal].sides == 8) if(ginf[gCrystal].sides == 8)
f.write(ginf[gCrystal].vertex); f.write(ginf[gCrystal].vertex);
} }
#endif
#if CAP_ARCM
if(geometry == gArchimedean) f.write(arcm::current.symbol); if(geometry == gArchimedean) f.write(arcm::current.symbol);
#endif
// game settings // game settings
f.write(safety); f.write(safety);
@@ -245,10 +253,12 @@ namespace mapstream {
char nbtype; char nbtype;
f.read(nbtype); f.read(nbtype);
variation = eVariation(nbtype); variation = eVariation(nbtype);
#if CAP_GP
if(GOLDBERG) { if(GOLDBERG) {
f.read(gp::param.first); f.read(gp::param.first);
f.read(gp::param.second); f.read(gp::param.second);
} }
#endif
if(geometry == gTorus) { if(geometry == gTorus) {
f.read(torusconfig::qty); f.read(torusconfig::qty);
f.read(torusconfig::dx); f.read(torusconfig::dx);
@@ -260,6 +270,7 @@ namespace mapstream {
} }
torusconfig::activate(); torusconfig::activate();
} }
#if CAP_CRYSTAL
if(geometry == gCrystal && vernum >= 10504) { if(geometry == gCrystal && vernum >= 10504) {
int sides; int sides;
f.read(sides); f.read(sides);
@@ -276,6 +287,8 @@ namespace mapstream {
} }
} }
} }
#endif
#if CAP_FIELD
if(geometry == gFieldQuotient) { if(geometry == gFieldQuotient) {
using namespace fieldpattern; using namespace fieldpattern;
f.read(quotient_field_changed); f.read(quotient_field_changed);
@@ -285,6 +298,8 @@ namespace mapstream {
enableFieldChange(); enableFieldChange();
} }
} }
#endif
#if CAP_ARCM
if(geometry == gArchimedean) { if(geometry == gArchimedean) {
string& symbol = arcm::current.symbol; string& symbol = arcm::current.symbol;
symbol = f.get<string>(); symbol = f.get<string>();
@@ -293,6 +308,7 @@ namespace mapstream {
printf("Errors! %s\n", arcm::current.errormsg.c_str()); printf("Errors! %s\n", arcm::current.errormsg.c_str());
} }
} }
#endif
} }
need_reset_geometry = true; need_reset_geometry = true;