mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix hyperroid builds 

- add cap guards where necessary
- adapt to new `shiftpoint` datatype and function interfaces thereof
This commit is contained in:
still-flow 2020-10-05 21:48:56 +03:00
parent 872301c7cf
commit a8691f0d8e
7 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -1326,7 +1326,9 @@ EX void configureOther() {
dialog::bound_low(0); dialog::bound_low(0);
dialog::bound_up(MIX_MAX_VOLUME); dialog::bound_up(MIX_MAX_VOLUME);
dialog::extra_options = [] { dialog::extra_options = [] {
#if CAP_SDLAUDIO
dialog::addBoolItem_action(XLAT("play music when out of focus"), music_out_of_focus, 'A'); dialog::addBoolItem_action(XLAT("play music when out of focus"), music_out_of_focus, 'A');
#endif
}; };
}); });

2
fake.cpp
View File

@ -605,6 +605,7 @@ EX void configure() {
}; };
} }
#if CAP_COMMANDLINE
int readArgs() { int readArgs() {
using namespace arg; using namespace arg;
@ -621,6 +622,7 @@ int readArgs() {
} }
auto fundamentalhook = addHook(hooks_args, 100, readArgs); auto fundamentalhook = addHook(hooks_args, 100, readArgs);
#endif
EX } EX }

2
hyperroid/app/src/main/jni/hyper.cpp
View File

@ -310,7 +310,7 @@ extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) {
// text is drawn with 'textured' // text is drawn with 'textured'
dynamicval<eModel> p(pmodel, mdManual); dynamicval<eModel> p(pmodel, mdManual);
current_display->next_shader_flags = GF_TEXTURE; current_display->next_shader_flags = GF_TEXTURE;
current_display->set_all(0); current_display->set_all(0, 0);
glhr::set_depthtest(false); glhr::set_depthtest(false);
current_display->set_viewport(0); current_display->set_viewport(0);
current_display->set_mask(0); current_display->set_mask(0);

8
mobile.cpp
View File

@ -250,7 +250,7 @@ EX void mobile_draw(MOBPAR_FORMAL) {
if(h < rad*SKIPFAC) { lmouseover = cwt.at; mousedest.d = -1; } if(h < rad*SKIPFAC) { lmouseover = cwt.at; mousedest.d = -1; }
else { else {
double d = vid.revcontrol ? -1 : 1; double d = vid.revcontrol ? -1 : 1;
mouseh = hpxy(dx * d / rad, dy * d / rad); mouseh = shiftless(hpxy(dx * d / rad, dy * d / rad));
calcMousedest(); calcMousedest();
} }
} }
@ -270,7 +270,7 @@ EX void mobile_draw(MOBPAR_FORMAL) {
inmenu = isize(screens) > 1; inmenu = isize(screens) > 1;
if(!inmenu && vid.stereo_mode == sLR && ors::mode) 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++; frames++;
models::configure(); models::configure();
@ -351,8 +351,8 @@ EX void mobile_draw(MOBPAR_FORMAL) {
} }
#if CAP_RUG #if CAP_RUG
if(andmode == 1 && normal_reaction && rug::rugged && clicked) // if(andmode == 1 && normal_reaction && rug::rugged && clicked)
rug::move_forward((ticks - lticks_rug) / 2500.); // rug::move_forward((ticks - lticks_rug) / 2500.);
#endif #endif
lticks_rug = ticks; lticks_rug = ticks;

2
screenshot.cpp
View File

@ -1589,12 +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(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
#if CAP_RUG #if CAP_RUG
if(rug::rugged) { if(rug::rugged) {

2
sky.cpp
View File

@ -447,7 +447,9 @@ EX void make_air() {
if(vid.antialias & AA_LINES) if(vid.antialias & AA_LINES)
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
#if CAP_SDL
if(anyshiftclick) IMAGESAVE(airbuf->render(), "air.png"); if(anyshiftclick) IMAGESAVE(airbuf->render(), "air.png");
#endif
rb.reset(); rb.reset();
} }

2
surface.cpp
View File

@ -843,7 +843,9 @@ int surface_args() {
} }
#endif #endif
#if CAP_COMMANDLINE
auto surface_hook = addHook(hooks_args, 100, surface_args); auto surface_hook = addHook(hooks_args, 100, surface_args);
#endif
void display_coverage() { void display_coverage() {