mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-13 21:47:38 +00:00
Code Issues Releases Wiki Activity

fake::split() = fake::in() or arb::in_slided() is used when both are applicable for a condition

Browse Source
This commit is contained in:
Zeno Rogue
2020-06-03 11:43:35 +02:00
parent ab379435d4
commit 0ae3ab3c9b
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shmup.cpp
View File

@@ -114,7 +114,7 @@ vector<monster*> active, nonvirtual, additional;
cell *findbaseAround(hyperpoint p, cell *around, int maxsteps) {
if(fake::in() || arb::in_slided()) {
if(fake::split()) {
auto p0 = inverse(ggmatrix(around)) * p;
virtualRebase(around, p0);
return around;
@@ -187,13 +187,13 @@ void monster::rebasePat(const transmatrix& new_pat, cell *c2) {
current_display->which_copy = ggmatrix(base);
return;
}
if(quotient || fake::in() || arb::in_slided()) {
if(quotient || fake::split()) {
at = inverse(gmatrix[base]) * new_pat;
transmatrix old_at = at;
virtualRebase(this);
fix_to_2(at);
if(base != c2) {
if(fake::in() || arb::in_slided()) println(hlog, "fake error");
if(fake::split()) println(hlog, "fake error");
else {
auto T = calc_relative_matrix(c2, base, tC0(at));
base = c2;
@@ -1637,7 +1637,7 @@ void moveBullet(monster *m, int delta) {
}
else
nat = parallel_transport(nat, m->ori, fronttangent(delta * SCALE * m->vel / speedfactor()));
cell *c2 = m->findbase(nat, fake::in() ? 10 : 1);
cell *c2 = m->findbase(nat, fake::split() ? 10 : 1);
if(m->parent && isPlayer(m->parent) && markOrb(itOrbLava) && c2 != m->base && !isPlayerOn(m->base))
makeflame(m->base, 5, false);