mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mend merge confglict w/ master

This commit is contained in:
still-flow 2020-10-15 22:42:27 +03:00
parent 8274448de8
commit 0d174064cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
screenshot.cpp
View File

@ -1589,14 +1589,14 @@ EX void show() {
animator(XLATN("Ocean"), env_ocean, 'o');
animator(XLATN("Volcanic Wasteland"), env_volcano, 'v');
if(shmup::on) dialog::addBoolItem_action(XLAT("shmup action"), env_shmup, 'T');
#if CAP_FILE && CAP_SHOT
#if CAP_FILES && CAP_SHOT
if(cheater) {
dialog::addSelItem(XLAT("monster turns"), its(numturns), 'n');
dialog::add_action([] {
dialog::editNumber(numturns, 0, 100, 1, 0, XLAT("monster turns"), XLAT("Number of turns to pass. Useful when simulating butterflies or cellular automata."));
});
}
#endif
#endif
#if CAP_RUG
if(rug::rugged) {