From 90ff26bdc18a1b4ea0a18c70c76d273a6ca06737 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 25 Dec 2008 09:43:00 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@1193
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/build/src/build.c | 64 ++++++++++++++++++++-----------
 polymer/eduke32/source/astub.c    |  3 +-
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index fc546d1ef..4b97ec84d 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -74,6 +74,8 @@ int hvel;
 int grponlymode = 0;
 extern int editorgridextent;	// in engine.c
 extern double msens;
+int graphicsmode = 0;
+extern int xyaspect;
 
 int synctics = 0, lockclock = 0;
 
@@ -1533,7 +1535,8 @@ void overheadeditor(void)
             }
         }
 
-        idle();
+        if (!graphicsmode)
+            idle();
         OSD_DispatchQueued();
 
         oldmousebstatus = bstatus;
@@ -1612,21 +1615,27 @@ void overheadeditor(void)
 
         clear2dscreen();
 
-        for (i=0;i<(MAXSECTORS>>3);i++)
-            show2dsector[i] = 255;
-        for (i=0;i<(MAXWALLS>>3);i++)
-            show2dwall[i] = 255;
-        for (i=0;i<(MAXSPRITES>>3);i++)
-            show2dsprite[i] = 255;
+        if (graphicsmode)
+        {
+            int ii;
+
+            Bmemset(show2dsector, 255, sizeof(show2dsector));
+            Bmemset(show2dwall, 255, sizeof(show2dwall));
+            Bmemset(show2dsprite, 255, sizeof(show2dsprite));
+
+            setview(0,0,xdim-1,ydim16-1);
+            i = yxaspect;
+            yxaspect = 65536;
+            j = ydim;
+            ydim -= scale(128,ydim,768);
+            ii = xyaspect;
+            xyaspect = 65536;
+            drawmapview(posx, posy, zoom, 1536);
+            yxaspect = i;
+            ydim = j;
+            xyaspect = ii;
+        }
 
-        setview(0,0,xdim-1,ydim16-1);
-        i = yxaspect;
-        yxaspect = 65536;
-        j = ydim;
-        ydim = ydim16;
-        drawmapview(posx, posy, zoom, 1536);
-        yxaspect = i;
-        ydim = j;
         draw2dgrid(posx,posy,ang,zoom,grid);
 
         ExtPreCheckKeys();
@@ -4132,18 +4141,27 @@ SKIP:
             }
         }
 
-        if (keystatus[0x0e] && (newnumwalls >= numwalls)) //Backspace
+        if (keystatus[0x0e]) //Backspace
         {
-            if (newnumwalls > numwalls)
+            if (newnumwalls >= numwalls)
             {
-                newnumwalls--;
-                asksave = 1;
-                keystatus[0x0e] = 0;
+                if (newnumwalls > numwalls)
+                {
+                    newnumwalls--;
+                    asksave = 1;
+                    keystatus[0x0e] = 0;
+                }
+                if (newnumwalls == numwalls)
+                {
+                    newnumwalls = -1;
+                    asksave = 1;
+                    keystatus[0x0e] = 0;
+                }
             }
-            if (newnumwalls == numwalls)
+            else
             {
-                newnumwalls = -1;
-                asksave = 1;
+                graphicsmode = !graphicsmode;
+                printmessage16("2D mode textures %s",graphicsmode?"enabled":"disabled");
                 keystatus[0x0e] = 0;
             }
         }
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index fd45fc497..2b628b8b0 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -8695,6 +8695,7 @@ static char wallpals[MAXWALLS];
 static char sectorpals[MAXSECTORS][2];
 static char spritepals[MAXSPRITES];
 static char wallflag[MAXWALLS];
+extern int graphicsmode;
 
 void ExtPreCheckKeys(void) // just before drawrooms
 {
@@ -8781,7 +8782,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
         xp1 = mulscale14(sprite[i].x-posx,zoom);
         yp1 = mulscale14(sprite[i].y-posy,zoom);
 
-        if (zoom >= 256 && (sprite[i].cstat & 48) == 0)
+        if (graphicsmode && zoom >= 256 && (sprite[i].cstat & 48) == 0)
             rotatesprite((halfxdim16+xp1)<<16,(midydim16+yp1)<<16,zoom<<5,0,sprite[i].picnum,
             (i+16384 == pointhighlight && totalclock&32)?8:0,sprite[i].pal,0,0,0,xdim-1,ydim16-1);