1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00

tour:: ENTER/BACKSPACE now checks whether a subgame is one with gamestack::pushed(), not with geometry || nonbitrunc (more general)

This commit is contained in:
Zeno Rogue 2018-07-23 23:38:30 +02:00
parent 19ac4dd945
commit b9796c86ba

View File

@ -90,7 +90,7 @@ bool handleKeyTour(int sym, int uni) {
int flags = slides[currentslide].flags; int flags = slides[currentslide].flags;
if((sym == SDLK_RETURN || sym == SDLK_KP_ENTER) && (!inhelp || (flags & QUICKSKIP))) { if((sym == SDLK_RETURN || sym == SDLK_KP_ENTER) && (!inhelp || (flags & QUICKSKIP))) {
popScreenAll(); popScreenAll();
if(geometry || nonbitrunc) { if(gamestack::pushed()) {
return_geometry(); return_geometry();
if(!(flags & QUICKGEO)) return true; if(!(flags & QUICKGEO)) return true;
} }
@ -102,7 +102,7 @@ bool handleKeyTour(int sym, int uni) {
return true; return true;
} }
if(sym == SDLK_BACKSPACE) { if(sym == SDLK_BACKSPACE) {
if(geometry || nonbitrunc) { if(gamestack::pushed()) {
pop_game(); pop_game();
if(!(flags & QUICKGEO)) return true; if(!(flags & QUICKGEO)) return true;
} }