mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-23 01:47:39 +00:00
Code Issues Releases Wiki Activity

more cleanup in parameters, restartGame cleanup

Browse Source
This commit is contained in:
Zeno Rogue
2018-06-11 00:58:38 +02:00
parent 90573cf456
commit 98246d3066
20 changed files with 344 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pattern2.cpp
View File

@@ -1315,21 +1315,24 @@ namespace patterns {
canvasback = c >> 8;
firstland = specialland = laCanvas;
randomPatternsMode = false;
restartGame(0, false, true);
stop_game();
start_game();
};
}
else if(uni == 'i') {
canvas_invisible = !canvas_invisible;
firstland = specialland = laCanvas;
randomPatternsMode = false;
restartGame(0, false, true);
stop_game();
start_game();
}
else if((uni >= 'a' && uni <= 'z') || (uni >= 'A' && uni <= 'Z')) {
whichCanvas = uni;
subcanvas = rand();
firstland = specialland = laCanvas;
randomPatternsMode = false;
restartGame(0, false, true);
stop_game();
start_game();
if(uni == 'x' || uni == 'z' || uni == 't')
whichPattern = PAT_ZEBRA, subpattern_flags = SPF_SYM0123 | SPF_ROT;
if(uni == 'e')
@@ -1640,9 +1643,10 @@ namespace patterns {
auto old_tstate_max = texture::config.tstate_max;
#endif
auto &g = cpatterns[cgroup].geometries[uni - 'a'];
if(g.geo != geometry) { targetgeometry = g.geo; restartGame(rg::geometry, false, true); }
if(gp::on) restartGame(rg::gp, false, true);
if(g.nonbitru != nonbitrunc) restartGame(rg::bitrunc, false, true);
if(g.geo != geometry) { targetgeometry = g.geo; stop_game_and_switch_mode(rg::geometry); }
if(gp::on) stop_game_and_switch_mode(rg::gp);
if(g.nonbitru != nonbitrunc) stop_game_and_switch_mode(rg::bitrunc);;
start_game();
whichPattern = g.whichPattern;
subpattern_flags = g.subpattern_flags;
#if CAP_TEXTURE