mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-03-19 19:39:43 +00:00
Code Issues Releases Wiki Activity

major rewrite: unified the common parts of heptagon and cell via struct connection<T> and struct walker<T>

Browse Source
This commit is contained in:
Zeno Rogue
2018-08-18 00:46:45 +02:00
parent a5a3cf1c87
commit 682f804576
50 changed files with 1848 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
textures.cpp
View File

@@ -846,7 +846,7 @@ bool texture_config::save() {
targetgeometry = geometry;
target_nonbitru = nonbitrunc;
cell *ctr = euclid ? centerover.c : viewctr.h->c7;
cell *ctr = euclid ? centerover.at : viewctr.at->c7;
si_save = patterns::getpatterninfo0(ctr);
for(auto s: texturesavers) if(s->dosave())
@@ -892,11 +892,11 @@ bool texture_config::load() {
celllister cl(currentmap->gamestart(), 20, 10000, NULL);
bool found = false;
for(cell *c: cl.lst) if(euclid || ctof(c)) {
cell *ctr = euclid ? centerover.c : viewctr.h->c7;
cell *ctr = euclid ? centerover.at : viewctr.at->c7;
auto si_here = patterns::getpatterninfo0(c);
if(si_here.id == si_save.id && si_here.reflect == si_save.reflect && si_here.dir == si_save.dir) {
if(euclid) centerover.c = ctr;
else viewctr.h = ctr->master;
if(euclid) centerover.at = ctr;
else viewctr.at = ctr->master;
found = true;
break;
}
@@ -1174,7 +1174,7 @@ void showMenu() {
#if CAP_EDIT
else if(uni == 'e' && config.tstate == tsActive) {
mapeditor::initdraw(cwt.c);
mapeditor::initdraw(cwt.at);
pushScreen(mapeditor::showDrawEditor);
}
@@ -1184,7 +1184,7 @@ void showMenu() {
config.tstate = config.tstate_max = tsActive;
config.perform_mapping();
config.finish_mapping();
mapeditor::initdraw(cwt.c);
mapeditor::initdraw(cwt.at);
pushScreen(mapeditor::showDrawEditor);
}
}