diff --git a/config.cpp b/config.cpp index 7296c4ef..d3f5fde4 100644 --- a/config.cpp +++ b/config.cpp @@ -1326,7 +1326,9 @@ EX void configureOther() { dialog::bound_low(0); dialog::bound_up(MIX_MAX_VOLUME); dialog::extra_options = [] { +#if CAP_SDLAUDIO dialog::addBoolItem_action(XLAT("play music when out of focus"), music_out_of_focus, 'A'); +#endif }; }); diff --git a/fake.cpp b/fake.cpp index 336a66f9..846b5840 100644 --- a/fake.cpp +++ b/fake.cpp @@ -605,6 +605,7 @@ EX void configure() { }; } +#if CAP_COMMANDLINE int readArgs() { using namespace arg; @@ -621,6 +622,7 @@ int readArgs() { } auto fundamentalhook = addHook(hooks_args, 100, readArgs); +#endif EX } diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp index 3611d192..b665cfcb 100644 --- a/hyperroid/app/src/main/jni/hyper.cpp +++ b/hyperroid/app/src/main/jni/hyper.cpp @@ -310,7 +310,7 @@ extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) { // text is drawn with 'textured' dynamicval p(pmodel, mdManual); current_display->next_shader_flags = GF_TEXTURE; - current_display->set_all(0); + current_display->set_all(0, 0); glhr::set_depthtest(false); current_display->set_viewport(0); current_display->set_mask(0); diff --git a/mobile.cpp b/mobile.cpp index 312724db..701b6e22 100644 --- a/mobile.cpp +++ b/mobile.cpp @@ -250,7 +250,7 @@ EX void mobile_draw(MOBPAR_FORMAL) { if(h < rad*SKIPFAC) { lmouseover = cwt.at; mousedest.d = -1; } else { double d = vid.revcontrol ? -1 : 1; - mouseh = hpxy(dx * d / rad, dy * d / rad); + mouseh = shiftless(hpxy(dx * d / rad, dy * d / rad)); calcMousedest(); } } @@ -270,7 +270,7 @@ EX void mobile_draw(MOBPAR_FORMAL) { inmenu = isize(screens) > 1; if(!inmenu && vid.stereo_mode == sLR && ors::mode) - mousex = vid.xres/2, mousey = vid.yres/2, mouseh = sphereflip * C0; + mousex = vid.xres/2, mousey = vid.yres/2, mouseh = shiftless(sphereflip * C0); frames++; models::configure(); @@ -351,8 +351,8 @@ EX void mobile_draw(MOBPAR_FORMAL) { } #if CAP_RUG - if(andmode == 1 && normal_reaction && rug::rugged && clicked) - rug::move_forward((ticks - lticks_rug) / 2500.); + // if(andmode == 1 && normal_reaction && rug::rugged && clicked) + // rug::move_forward((ticks - lticks_rug) / 2500.); #endif lticks_rug = ticks; diff --git a/screenshot.cpp b/screenshot.cpp index 9ac85280..32ab311c 100644 --- a/screenshot.cpp +++ b/screenshot.cpp @@ -1589,12 +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(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 #if CAP_RUG if(rug::rugged) { diff --git a/sky.cpp b/sky.cpp index edd39aa7..0e01a12a 100644 --- a/sky.cpp +++ b/sky.cpp @@ -447,7 +447,9 @@ EX void make_air() { if(vid.antialias & AA_LINES) glEnable(GL_LINE_SMOOTH); +#if CAP_SDL if(anyshiftclick) IMAGESAVE(airbuf->render(), "air.png"); +#endif rb.reset(); } diff --git a/surface.cpp b/surface.cpp index 51ceb6e1..0047bcfb 100644 --- a/surface.cpp +++ b/surface.cpp @@ -843,7 +843,9 @@ int surface_args() { } #endif +#if CAP_COMMANDLINE auto surface_hook = addHook(hooks_args, 100, surface_args); +#endif void display_coverage() {