mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-06-14 12:24:06 +00:00
with unfitting sliders, also fix shmup
This commit is contained in:
parent
b55503dc9f
commit
ab379435d4
@ -114,7 +114,7 @@ vector<monster*> active, nonvirtual, additional;
|
|||||||
|
|
||||||
cell *findbaseAround(hyperpoint p, cell *around, int maxsteps) {
|
cell *findbaseAround(hyperpoint p, cell *around, int maxsteps) {
|
||||||
|
|
||||||
if(fake::in()) {
|
if(fake::in() || arb::in_slided()) {
|
||||||
auto p0 = inverse(ggmatrix(around)) * p;
|
auto p0 = inverse(ggmatrix(around)) * p;
|
||||||
virtualRebase(around, p0);
|
virtualRebase(around, p0);
|
||||||
return around;
|
return around;
|
||||||
@ -187,13 +187,13 @@ void monster::rebasePat(const transmatrix& new_pat, cell *c2) {
|
|||||||
current_display->which_copy = ggmatrix(base);
|
current_display->which_copy = ggmatrix(base);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(quotient || fake::in()) {
|
if(quotient || fake::in() || arb::in_slided()) {
|
||||||
at = inverse(gmatrix[base]) * new_pat;
|
at = inverse(gmatrix[base]) * new_pat;
|
||||||
transmatrix old_at = at;
|
transmatrix old_at = at;
|
||||||
virtualRebase(this);
|
virtualRebase(this);
|
||||||
fix_to_2(at);
|
fix_to_2(at);
|
||||||
if(base != c2) {
|
if(base != c2) {
|
||||||
if(fake::in()) println(hlog, "fake error");
|
if(fake::in() || arb::in_slided()) println(hlog, "fake error");
|
||||||
else {
|
else {
|
||||||
auto T = calc_relative_matrix(c2, base, tC0(at));
|
auto T = calc_relative_matrix(c2, base, tC0(at));
|
||||||
base = c2;
|
base = c2;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user