mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-22 19:37:04 +00:00
fixup to know actual_geometry
This commit is contained in:
parent
f224cc1027
commit
3e7a604408
@ -685,7 +685,7 @@ EX land_validity_t& land_validity(eLand l) {
|
||||
return lv::not_implemented;
|
||||
if(among(l, laReptile, laDragon, laTortoise))
|
||||
return lv::bad_graphics;
|
||||
if((actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
|
||||
if((hybrid::actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
|
||||
return lv::hedgehogs;
|
||||
if(hybri) return *PIU(&land_validity(l));
|
||||
}
|
||||
|
@ -584,7 +584,7 @@ EX namespace hybrid {
|
||||
|
||||
hrmap *pmap;
|
||||
geometry_information *pcgip;
|
||||
geometry actual_geometry;
|
||||
eGeometry actual_geometry;
|
||||
|
||||
template<class T> auto in_actual(const T& t) -> decltype(t()) {
|
||||
dynamicval<eGeometry> g(geometry, actual_geometry);
|
||||
@ -606,7 +606,7 @@ EX namespace hybrid {
|
||||
template<class T> auto in_underlying(const T& t) -> decltype(t()) {
|
||||
pcgip = cgip;
|
||||
dynamicval<hrmap*> gpm(pmap, this);
|
||||
dynamicval<hrmap*> gag(actual_geometry, geometry);
|
||||
dynamicval<eGeometry> gag(actual_geometry, geometry);
|
||||
dynamicval<eGeometry> g(geometry, underlying);
|
||||
dynamicval<geometry_information*> gc(cgip, underlying_cgip);
|
||||
dynamicval<hrmap*> gu(currentmap, underlying_map);
|
||||
|
Loading…
x
Reference in New Issue
Block a user