mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

more guards for CAP_SHOT/CAP_FILES

Browse Source
This commit is contained in:
Zeno Rogue
2018-12-15 15:20:27 +01:00
parent c08cad3e0b
commit 8a6d3173bd
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.cpp
View File

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

2
control.cpp
View File

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

4
screenshot.cpp
View File

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