From d47187a92d8d37f474a78df0dd768cd3f6dec456 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 8 Jul 2015 03:34:31 +0000
Subject: [PATCH] Enable sector drawing and textured map in Mapster32 sideview
 mode with a sideview elevation of 512 (straight up and down).

git-svn-id: https://svn.eduke32.com/eduke32@5278 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/build.c  |  9 ++++++---
 polymer/eduke32/build/src/engine.c | 15 +++++++--------
 polymer/eduke32/source/astub.c     | 16 ++++++++++++----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index e1ae09625..e4926a94c 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -3368,7 +3368,7 @@ void overheadeditor(void)
 
             setup_sideview_sincos();
 
-            if (graphicsmode && !m32_sideview)
+            if (graphicsmode && (!m32_sideview || m32_sideelev == 512))
             {
                 Bmemset(show2dsector, 0, sizeof(show2dsector));
                 for (i=0; i<numsectors; i++)
@@ -3382,7 +3382,7 @@ void overheadeditor(void)
                 if (graphicsmode == 2)
                     totalclocklock = totalclock;
 
-                drawmapview(pos.x, pos.y, zoom, 1536);
+                drawmapview(pos.x, pos.y, zoom, m32_sideview ? -m32_sideang + 1536 : 1536);
             }
 
             draw2dgrid(pos.x,pos.y,pos.z,cursectnum,ang,zoom,grid);
@@ -6683,7 +6683,10 @@ end_join_sectors:
             keystatus[0x2e] = 0;
         }
 
-        bad = keystatus[0x39] && !m32_sideview;  //Gotta do this to save lots of 3 spaces!
+        bad = keystatus[0x39] && (!m32_sideview || m32_sideelev == 512);  //Gotta do this to save lots of 3 spaces!
+
+        if (keystatus[0x39] && !bad)
+            message("Unable to create sectors in angled sideview mode.");
 
         if (circlewall >= 0)
         {
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 6946f1c53..acb311704 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -17454,14 +17454,13 @@ void draw2dscreen(const vec3_t *pos, int16_t cursectnum, int16_t ange, int32_t z
                 m32_wallsprite[m32_swcnt++] = j;
                 sideview_getdist(j, i);
             }
-        /*
-                // j = sector[numsectors-1].wallptr + sector[numsectors-1].wallnum
-                for (; j<numwalls; j++)  // new walls ...
-                {
-                    m32_wallsprite[m32_swcnt++] = j;
-                    m32_sidedist[j] = sideview_getdist(j, 0);
-                }
-        */
+
+        // j = sector[numsectors-1].wallptr + sector[numsectors-1].wallnum
+        for (; j < numwalls; j++)  // new walls ...
+        {
+            m32_wallsprite[m32_swcnt++] = j;
+            sideview_getdist(j, 0);
+        }
     }
 
     faketimerhandler();
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 0048f6087..c22782dcc 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -10114,7 +10114,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
     //    if (cursectornum >= 0)
     //        fillsector(cursectornum, 31);
 
-    if (graphicsmode && !m32_sideview && zoom >= 256)
+    if (graphicsmode && (!m32_sideview || m32_sideelev == 512) && zoom >= 256)
     {
         for (i=ii=0; i<MAXSPRITES && ii < Numsprites; i++)
         {
@@ -10218,10 +10218,18 @@ void ExtPreCheckKeys(void) // just before drawrooms
                 if (shade < 6)
                     shade = 6;
             }
+            
+            if (m32_sideview)
+            {
+                screencoords(&xp1, &yp1, sprite[i].x-pos.x, sprite[i].y-pos.y, zoom);
+                yp1 += midydim16 + getscreenvdisp(sprite[i].z-pos.z, zoom);
+                yp1 -= mulscale14(tilesiz[picnum].y<<2, zoom);
+                xp1 += halfxdim16;
+            }
+            else 
+                ovhscrcoords(sprite[i].x, sprite[i].y-(tilesiz[picnum].y<<2), &xp1, &yp1);
 
-            ovhscrcoords(sprite[i].x, sprite[i].y-(tilesiz[picnum].y<<2), &xp1, &yp1);
-
-            ydim16 = ydim-STATUS2DSIZ2;  // XXX?
+            ydim16 = ydim - STATUS2DSIZ2;  // XXX?
 
             if (xp1 < 4 || xp1 > xdim-6 || yp1 < 4 || yp1 > ydim16-6)
                 continue;