1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00

racing::standard_centering auto-disabled in Solv

This commit is contained in:
Zeno Rogue 2019-08-03 11:38:38 +02:00
parent b97326cfa8
commit b6c2457a13
2 changed files with 4 additions and 3 deletions

View File

@ -25,7 +25,7 @@ bool in_perspective() {
bool hide_player() { bool hide_player() {
return DIM == 3 && playermoved && vid.yshift == 0 && vid.sspeed > -5 && in_perspective() && (first_cell_to_draw || elliptic) && (WDIM == 3 || vid.camera == 0) && !inmirrorcount return DIM == 3 && playermoved && vid.yshift == 0 && vid.sspeed > -5 && in_perspective() && (first_cell_to_draw || elliptic) && (WDIM == 3 || vid.camera == 0) && !inmirrorcount
#if CAP_RACING #if CAP_RACING
&& !(racing::on && !racing::standard_centering && !racing::player_relative) && !(racing::on && !racing::standard_centering && !racing::player_relative && !sol)
#endif #endif
; ;
} }

View File

@ -706,7 +706,7 @@ bool set_view() {
}); });
} }
if(standard_centering) return false; if(standard_centering || sol) return false;
if(player_relative && specialland == laAsteroids) return false; if(player_relative && specialland == laAsteroids) return false;
transmatrix at = ypush(-vid.yshift) * ggmatrix(who->base) * who->at; transmatrix at = ypush(-vid.yshift) * ggmatrix(who->base) * who->at;
@ -973,7 +973,7 @@ void race_projection() {
if(true) { if(true) {
dialog::addSelItem(XLAT("point of view"), XLAT(player_relative ? "player" : "track"), 'p'); dialog::addSelItem(XLAT("point of view"), XLAT(player_relative ? "player" : "track"), 'p');
if(quotient || racing::standard_centering) if(quotient || racing::standard_centering || sol)
dialog::lastItem().value = XLAT("N/A"); dialog::lastItem().value = XLAT("N/A");
dialog::add_action([] () { dialog::add_action([] () {
player_relative = !player_relative; player_relative = !player_relative;
@ -1000,6 +1000,7 @@ void race_projection() {
}); });
dialog::addBoolItem(XLAT("do not use special centering for racing"), standard_centering, 'C'); dialog::addBoolItem(XLAT("do not use special centering for racing"), standard_centering, 'C');
if(sol) dialog::lastItem().value = XLAT("N/A");
dialog::add_action([] () { dialog::add_action([] () {
standard_centering = !standard_centering; standard_centering = !standard_centering;
}); });