mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-06-14 09:26:52 +00:00
mend merge confglict w/ master
This commit is contained in:
parent
8274448de8
commit
0d174064cf
|
@ -1589,14 +1589,14 @@ EX void show() {
|
||||||
animator(XLATN("Ocean"), env_ocean, 'o');
|
animator(XLATN("Ocean"), env_ocean, 'o');
|
||||||
animator(XLATN("Volcanic Wasteland"), env_volcano, 'v');
|
animator(XLATN("Volcanic Wasteland"), env_volcano, 'v');
|
||||||
if(shmup::on) dialog::addBoolItem_action(XLAT("shmup action"), env_shmup, 'T');
|
if(shmup::on) dialog::addBoolItem_action(XLAT("shmup action"), env_shmup, 'T');
|
||||||
#if CAP_FILE && CAP_SHOT
|
#if CAP_FILES && CAP_SHOT
|
||||||
if(cheater) {
|
if(cheater) {
|
||||||
dialog::addSelItem(XLAT("monster turns"), its(numturns), 'n');
|
dialog::addSelItem(XLAT("monster turns"), its(numturns), 'n');
|
||||||
dialog::add_action([] {
|
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."));
|
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 CAP_RUG
|
||||||
if(rug::rugged) {
|
if(rug::rugged) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user