From 0d174064cf4bda665e8a8670b186149ab107f209 Mon Sep 17 00:00:00 2001
From: still-flow <46608177+still-flow@users.noreply.github.com>
Date: Thu, 15 Oct 2020 22:42:27 +0300
Subject: [PATCH] mend merge confglict w/ master

---
 screenshot.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/screenshot.cpp b/screenshot.cpp
index 32ab311c..bfec97b5 100644
--- a/screenshot.cpp
+++ b/screenshot.cpp
@@ -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) {