From b6c2457a132125ef4bacec9f8fcb208f3bbd86c9 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 3 Aug 2019 11:38:38 +0200 Subject: [PATCH] racing::standard_centering auto-disabled in Solv --- graph.cpp | 2 +- racing.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/graph.cpp b/graph.cpp index 9de36cb1..f1d5a5b9 100644 --- a/graph.cpp +++ b/graph.cpp @@ -25,7 +25,7 @@ bool in_perspective() { 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 #if CAP_RACING - && !(racing::on && !racing::standard_centering && !racing::player_relative) + && !(racing::on && !racing::standard_centering && !racing::player_relative && !sol) #endif ; } diff --git a/racing.cpp b/racing.cpp index 3f1ca5d2..2333ffbb 100644 --- a/racing.cpp +++ b/racing.cpp @@ -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; transmatrix at = ypush(-vid.yshift) * ggmatrix(who->base) * who->at; @@ -973,7 +973,7 @@ void race_projection() { if(true) { 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::add_action([] () { player_relative = !player_relative; @@ -1000,6 +1000,7 @@ void race_projection() { }); dialog::addBoolItem(XLAT("do not use special centering for racing"), standard_centering, 'C'); + if(sol) dialog::lastItem().value = XLAT("N/A"); dialog::add_action([] () { standard_centering = !standard_centering; });