mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

racing forces standard_centering in quotient/nil/hybrid geometries

Browse Source
This commit is contained in:
Zeno Rogue 2019-09-27 18:04:04 +02:00
parent ce9f1c02f1
commit 8d9511ae79
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graph.cpp
View File

@ -27,7 +27,7 @@ EX bool in_perspective() {
EX bool hide_player() { EX bool hide_player() {
return GDIM == 3 && playermoved && vid.yshift == 0 && vid.sspeed > -5 && in_perspective() && (first_cell_to_draw || elliptic) && (WDIM == 3 || vid.camera == 0) && !inmirrorcount return GDIM == 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 && !sol) && !(racing::on && !racing::use_standard_centering() && !racing::player_relative)
#endif #endif
; ;
} }

16
racing.cpp
View File

@ -629,6 +629,14 @@ bool inrec = false;
EX ld race_angle = 90; EX ld race_angle = 90;
EX bool force_standard_centering() {
return sol || nil || hybri || quotient;
}
EX bool use_standard_centering() {
return standard_centering || force_standard_centering();
}
EX bool set_view() { EX bool set_view() {
multi::cpid = subscreens::in ? subscreens::current_player : 0; multi::cpid = subscreens::in ? subscreens::current_player : 0;
@ -650,7 +658,7 @@ EX bool set_view() {
}); });
} }
if(standard_centering || sol) return false; if(use_standard_centering()) 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;
@ -917,7 +925,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 || sol) if(racing::use_standard_centering())
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;
@ -944,7 +952,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"); if(force_standard_centering()) dialog::lastItem().value = XLAT("N/A");
dialog::add_action([] () { dialog::add_action([] () {
standard_centering = !standard_centering; standard_centering = !standard_centering;
}); });
@ -1266,7 +1274,7 @@ EX void markers() {
for(int j=0; j<5; j++) for(int j=0; j<5; j++)
gridline(m->pat, xpush0(j), xpush0(j+1), multi::scs[i].uicolor, 2); gridline(m->pat, xpush0(j), xpush0(j+1), multi::scs[i].uicolor, 2);
} }
if(racing::player_relative || racing::standard_centering || WDIM == 3) { if(racing::player_relative || use_standard_centering() || WDIM == 3) {
using namespace racing; using namespace racing;
cell *goal = NULL; cell *goal = NULL;
for(cell *c: track) if(inscreenrange(c)) goal = c; for(cell *c: track) if(inscreenrange(c)) goal = c;