mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-15 06:17:38 +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

7
mapeditor.cpp
View File

@@ -817,7 +817,7 @@ namespace mapeditor {
dialog::openColorDialog((unsigned&)(paintwhat = (painttype ==6 ? paintwhat : 0x808080)));
}
else if(sym == SDLK_F5) {
restartGame();
restart_game();
}
else if(sym == SDLK_F2) {
dialog::openFileDialog(levelfile, XLAT("level to save:"), ".lev", [] () {
@@ -1323,8 +1323,9 @@ namespace mapeditor {
int tg, nt, wp;
fscanf(f, "%d%d%d%d\n", &tg, &nt, &wp, &patterns::subpattern_flags);
patterns::whichPattern = wp;
if(tg != geometry) { targetgeometry = eGeometry(tg); restartGame(rg::geometry, 0, true); }
if(nt != nonbitrunc) { restartGame(rg::bitrunc, 0, true); }
if(tg != geometry) { targetgeometry = eGeometry(tg); stop_game_and_switch_mode(rg::geometry); }
if(nt != nonbitrunc) stop_game_and_switch_mode(rg::bitrunc);
start_game();
}
while(true) {