1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-09-29 14:30:40 +00:00

modern push/pop in rogueviz

This commit is contained in:
Zeno Rogue 2019-06-01 17:10:16 +02:00
parent cbe6a7f827
commit 7c8cf2e065

View File

@ -2327,7 +2327,7 @@ slide rvslides[] = {
[] (presmode mode) { [] (presmode mode) {
slidecommand = "staircase menu"; slidecommand = "staircase menu";
if(mode == 3) { if(mode == 3) {
while(gamestack::pushed()) pop_game(); while(gamestack::pushed()) stop_game(), gamestack::pop();
banachtarski::bmap = false; banachtarski::bmap = false;
banachtarski::on = false; banachtarski::on = false;
} }
@ -2335,7 +2335,7 @@ slide rvslides[] = {
if(!banachtarski::on) { if(!banachtarski::on) {
bool b = mapeditor::drawplayer; bool b = mapeditor::drawplayer;
specialland = cwt.at->land; specialland = cwt.at->land;
push_game(); gamestack::push();
banachtarski::init_bantar(); banachtarski::init_bantar();
airmap.clear(); airmap.clear();
dynamicval<int> vs(sightrange_bonus, 3); dynamicval<int> vs(sightrange_bonus, 3);
@ -2345,11 +2345,12 @@ slide rvslides[] = {
quitmainloop = false; quitmainloop = false;
mapeditor::drawplayer = b; mapeditor::drawplayer = b;
banachtarski::init_bantar_map(); banachtarski::init_bantar_map();
resetview();
} }
else if(banachtarski::on && banachtarski::bmap) { else if(banachtarski::on && banachtarski::bmap) {
banachtarski::bmap = false; banachtarski::bmap = false;
banachtarski::on = false; banachtarski::on = false;
pop_game(); gamestack::pop();
} }
} }
}}, }},