mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-29 06:47:03 +00:00
mend merge confglict w/ master
This commit is contained in:
parent
8274448de8
commit
0d174064cf
@ -1589,7 +1589,7 @@ 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([] {
|
||||
|
Loading…
x
Reference in New Issue
Block a user