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

fixup to know actual_geometry

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-25 19:50:14 +02:00
parent f224cc1027
commit 3e7a604408
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
landlock.cpp
View File

@ -685,7 +685,7 @@ EX land_validity_t& land_validity(eLand l) {
return lv::not_implemented; return lv::not_implemented;
if(among(l, laReptile, laDragon, laTortoise)) if(among(l, laReptile, laDragon, laTortoise))
return lv::bad_graphics; return lv::bad_graphics;
if((actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest) if((hybrid::actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
return lv::hedgehogs; return lv::hedgehogs;
if(hybri) return *PIU(&land_validity(l)); if(hybri) return *PIU(&land_validity(l));
} }

4
nonisotropic.cpp
View File

@ -584,7 +584,7 @@ EX namespace hybrid {
hrmap *pmap; hrmap *pmap;
geometry_information *pcgip; geometry_information *pcgip;
geometry actual_geometry; eGeometry actual_geometry;
template<class T> auto in_actual(const T& t) -> decltype(t()) { template<class T> auto in_actual(const T& t) -> decltype(t()) {
dynamicval<eGeometry> g(geometry, actual_geometry); dynamicval<eGeometry> g(geometry, actual_geometry);
@ -606,7 +606,7 @@ EX namespace hybrid {
template<class T> auto in_underlying(const T& t) -> decltype(t()) { template<class T> auto in_underlying(const T& t) -> decltype(t()) {
pcgip = cgip; pcgip = cgip;
dynamicval<hrmap*> gpm(pmap, this); dynamicval<hrmap*> gpm(pmap, this);
dynamicval<hrmap*> gag(actual_geometry, geometry); dynamicval<eGeometry> gag(actual_geometry, geometry);
dynamicval<eGeometry> g(geometry, underlying); dynamicval<eGeometry> g(geometry, underlying);
dynamicval<geometry_information*> gc(cgip, underlying_cgip); dynamicval<geometry_information*> gc(cgip, underlying_cgip);
dynamicval<hrmap*> gu(currentmap, underlying_map); dynamicval<hrmap*> gu(currentmap, underlying_map);