1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 23:50:27 +00:00

fixed for Steam compiler

This commit is contained in:
Zeno Rogue 2019-03-03 01:11:37 +01:00
parent 91d848cc74
commit 30272ce45e

View File

@ -18,7 +18,7 @@ namespace binary {
namespace reg3 { namespace reg3 {
int loop=4, face=5; int loop, face;
vector<hyperpoint> cellshape; vector<hyperpoint> cellshape;
@ -157,8 +157,6 @@ namespace reg3 {
heptagon *origin; heptagon *origin;
hrmap *binary_map; hrmap *binary_map;
int mycellcount = 1;
unordered_map<heptagon*, pair<heptagon*, transmatrix>> reg_gmatrix; unordered_map<heptagon*, pair<heptagon*, transmatrix>> reg_gmatrix;
unordered_map<heptagon*, vector<pair<heptagon*, transmatrix> > > altmap; unordered_map<heptagon*, vector<pair<heptagon*, transmatrix> > > altmap;
@ -171,6 +169,7 @@ namespace reg3 {
h.alt = NULL; h.alt = NULL;
h.distance = 0; h.distance = 0;
h.c7 = newCell(S7, origin); h.c7 = newCell(S7, origin);
worst_error1 = 0, worst_error2 = 0;
dynamicval<hrmap*> cr(currentmap, this); dynamicval<hrmap*> cr(currentmap, this);
@ -195,7 +194,7 @@ namespace reg3 {
altmap[alt].emplace_back(origin, T); altmap[alt].emplace_back(origin, T);
} }
ld worst_error1 = 0, worst_error2 = 0; ld worst_error1, worst_error2;
heptagon *getOrigin() { heptagon *getOrigin() {
return origin; return origin;
@ -250,9 +249,7 @@ namespace reg3 {
return p2.first; return p2.first;
} }
// println(hlog, "NOT found in ", isize(altmap[alt]), " intval = ", intval(tC0(p1.second),Hypc), " to = ", intval(hT,Hypc), " mcc = ", mycellcount);
if(DEB) println(hlog, "-> not found"); if(DEB) println(hlog, "-> not found");
mycellcount++;
heptagon *created = tailored_alloc<heptagon> (S7); heptagon *created = tailored_alloc<heptagon> (S7);
created->c7 = newCell(S7, created); created->c7 = newCell(S7, created);
created->alt = NULL; created->alt = NULL;