mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-18 11:19:59 +00:00
Code Issues Releases Wiki Activity

fixes to starting/stopping daily

Browse Source
This commit is contained in:
Zeno Rogue 2018-05-27 01:06:54 +02:00
parent 9fb73c79bb
commit b28c82b26b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
control.cpp
View File

@ -368,6 +368,10 @@ void handleKeyNormal(int sym, int uni) {
// if(sym == SDLK_F4) restartGameSwitchEuclid();
if(sym == SDLK_F5) {
#if CAP_DAILY
if(daily::on) daily::handleQuit(1);
else
#endif
if(needConfirmation())
pushScreen(showMission);
else restartGame();
@ -381,6 +385,10 @@ void handleKeyNormal(int sym, int uni) {
}
if(sym == SDLK_F10) {
#if CAP_DAILY
if(daily::on) daily::handleQuit(2);
else
#endif
if(needConfirmation()) pushScreen(showMission);
else quitmainloop = true;
}
@ -786,6 +794,10 @@ void handle_event(SDL_Event& ev) {
}
if(ev.type == SDL_QUIT) {
#if CAP_DAILY
if(daily::on) daily::handleQuit(3);
else
#endif
if(needConfirmation() && !(cmode & sm::MISSION)) showMissionScreen();
else quitmainloop = true;
}

10
menus.cpp
View File

@ -678,7 +678,7 @@ void showStartMenu() {
case 20:
dialog::addBreak(100);
dialog::addBigItem(XLAT1("Halloween"), 'z');
dialog::addBigItem(XLAT1("Halloween"), 'Z');
dialog::addInfo(XLAT("Halloween mini-game"));
break;
}
@ -770,7 +770,7 @@ void showStartMenu() {
pushScreen(multi::showShmupConfig);
}
}
else if(uni == 'z') {
else if(uni == 'Z') {
popScreenAll();
resetModes('g');
stampbase = ticks;
@ -789,6 +789,12 @@ void showStartMenu() {
tour::start();
}
#endif
#if CAP_DAILY
else if(uni == 'z') {
popScreenAll();
pushScreen(daily::showMenu);
}
#endif
#if CAP_ROGUEVIZ && CAP_TOUR
else if(uni == 'r') {
tour::slides = rogueviz::rvtour::rvslides;