more guards for CAP_SHOT/CAP_FILES

config.cpp

@@ -318,6 +318,7 @@ void initConfig() {
   addsaver(crystal::compass_probability, "compass-probability");
   addsaver(crystal::view_coordinates, "crystal-coordinates");
   
+  #if CAP_SHOT
   addsaver(shot::shotx, "shotx");
   addsaver(shot::shoty, "shoty");
   addsaver(shot::make_svg, "shotsvg");
@@ -325,6 +326,7 @@ void initConfig() {
   addsaver(shot::gamma, "shotgamma");
   addsaver(shot::caption, "shotcaption");
   addsaver(shot::fade, "shotfade");
+  #endif
 
 #if CAP_TEXTURE  
   addsaver(texture::texture_aura, "texture-aura", false);
@@ -1870,8 +1872,10 @@ unordered_map<string, ld&> params = {
   {"spiralx", conformal::spiral_x},
   {"spiraly", conformal::spiral_y},
   {"cprob", crystal::compass_probability},
+  #if CAP_SHOT
   {"gamma", shot::gamma},
-  {"fade", shot::fade}
+  {"fade", shot::fade},
+  #endif
   };
 
 }

control.cpp

@@ -327,7 +327,9 @@ void handleKeyNormal(int sym, int uni) {
       uni = sym = 0;
     }
 
+  #if CAP_SHOT
   if(uni == 'A') { pushScreen(shot::menu); uni = sym = 0; }
+  #endif
 
   if(DEFAULTNOR(sym)) handlePanning(sym, uni);
   

screenshot.cpp

@@ -656,7 +656,7 @@ void rollback() {
     }
   }
 
-#if CAP_FILES
+#if CAP_FILES && CAP_SHOT
 string animfile = "animation-%04d.png";
 
 bool record_animation() {
@@ -896,7 +896,7 @@ void show() {
   dialog::addBoolItem(XLAT("history mode"), (conformal::on || conformal::includeHistory), 'h');
   dialog::add_action([] () { pushScreen(conformal::history_menu); });
 
-  #if CAP_SHOT
+  #if CAP_FILES && CAP_SHOT
   dialog::addItem(XLAT("shot settings"), 's');
   dialog::add_action([] () { pushScreen(shot::menu); });