From 4351f9943273a17ab124f6bd3a7fe37ba91a69d2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 7 Jan 2023 22:51:46 +0100
Subject: [PATCH] fixed shmup in euc_in_nil and euc_in_sl2

---
 hypgraph.cpp | 9 +++++++--
 shmup.cpp    | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hypgraph.cpp b/hypgraph.cpp
index 78a7f378..b75ff742 100644
--- a/hypgraph.cpp
+++ b/hypgraph.cpp
@@ -2043,6 +2043,11 @@ EX transmatrix default_spin() {
   return cspin90(0, 1) * cgi.intermediate_to_logical_scaled;
   }
 
+EX bool shmup_inverted() {
+  if(!embedded_plane) return false;
+  return (vid.wall_height < 0) ^ (geom3::euc_in_nil() || geom3::euc_in_sl2());
+  }
+
 EX void centerpc(ld aspd) {
 
   if(subscreens::split([=] () {centerpc(aspd);})) return;
@@ -2073,11 +2078,11 @@ EX void centerpc(ld aspd) {
     else {
       adjust_eye(T, pc->base, +1);
       }
-
+    
     View = iview_inverse(T);
     if(gproduct) NLP = ortho_inverse(pc->ori);
     if(WDIM == 2) {
-      if(vid.wall_height < 0) rotate_view(cspin180(2, 1));
+      if(shmup_inverted()) rotate_view(cspin180(2, 1));
       if(gproduct)
         rotate_view( cspin(2, 1, -90._deg - shmup::playerturny[id]) * cspin90(0, 1));
       else
diff --git a/shmup.cpp b/shmup.cpp
index bf0b017a..f7a6a03d 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -885,7 +885,7 @@ void movePlayer(monster *m, int delta) {
   
   godir[cpid] = 0;
 
-  if(embedded_plane && vid.wall_height < 0) mdx = -mdx;
+  if(shmup_inverted()) mdx = -mdx;
 
   if(WDIM == 2 && GDIM == 3 && (mdx || mdy)) {
     double mdd = hypot(mdx, mdy);
@@ -936,7 +936,7 @@ void movePlayer(monster *m, int delta) {
     }
   #endif
 
-  if(embedded_plane && vid.wall_height < 0) playerturn[cpid] = -playerturn[cpid];
+  if(shmup_inverted()) playerturn[cpid] = -playerturn[cpid];
     
   if(playerturn[cpid] && canmove && !blown && WDIM == 2) {
     m->swordangle -= playerturn[cpid];