- removed all editor related code from 2D.cpp.

# Conflicts:
#	source/build/include/build.h
#	source/build/src/2d.cpp
#	source/build/src/softwarerenderer/engine_swr.cpp

source/build/include/build.h

@@ -1105,8 +1105,6 @@ void   videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2);
 void   renderSetAspect(int32_t daxrange, int32_t daaspect);
 void   renderFlushPerms(void);
 
-void plotlines2d(const int32_t *xx, const int32_t *yy, int32_t numpoints, int col) ATTRIBUTE((nonnull(1,2)));
-
 void   plotpixel(int32_t x, int32_t y, char col);
 void   renderSetTarget(int16_t tilenume, int32_t xsiz, int32_t ysiz);
 void   renderRestoreTarget(void);
@@ -1334,17 +1332,6 @@ int32_t wallvisible(int32_t const x, int32_t const y, int16_t const wallnum);
 #define STATUS2DSIZ 144
 #define STATUS2DSIZ2 26
 
-//void   qsetmode640350(void);
-//void   qsetmode640480(void);
-void   videoSet2dMode(int32_t,int32_t);
-void   clear2dscreen(void);
-void   editorDraw2dGrid(int32_t posxe, int32_t posye, int32_t posze, int16_t cursectnum,
-                  int16_t ange, int32_t zoome, int16_t gride);
-void   editorDraw2dScreen(const vec3_t *pos, int16_t cursectnum,
-                    int16_t ange, int32_t zoome, int16_t gride) ATTRIBUTE((nonnull(1)));
-int32_t   editorDraw2dLine(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int col);
-void   editorDraw2dCircle(int32_t x1, int32_t y1, int32_t r, int32_t eccen, char col);
-
 int32_t   videoSetRenderMode(int32_t renderer);
 
 #ifdef USE_OPENGL

source/build/include/editor.h

@@ -98,7 +98,6 @@ extern int32_t showfirstwall;
 extern int32_t graphicsmode;
 
 extern int32_t grid, autogrid;
-extern int32_t editorgridextent;	// in engine.c
 
 extern char game_executable[BMAX_PATH];
 extern const char* DefaultGameExec;
@@ -158,25 +157,6 @@ typedef struct mapundo_
 extern mapundo_t *mapstate;
 
 extern void FuncMenu(void);
-#ifdef LUNATIC
-extern void LuaFuncMenu(void);
-#endif
-
-// editor side view
-extern int32_t m32_sideview;
-extern int32_t m32_sideelev;
-extern int16_t m32_sideang;
-extern int32_t m32_sidecos, m32_sidesin;
-extern int32_t m32_swcnt;
-extern int32_t m32_wallscreenxy[MAXWALLS][2];
-extern int16_t m32_wallsprite[MAXWALLS+MAXSPRITES];
-extern int8_t sideview_reversehrot;
-extern int32_t scalescreeny(int32_t sy);
-extern void editorGet2dScreenCoordinates(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome) ATTRIBUTE((nonnull));
-//extern void invscreencoords(int32_t *dx, int32_t *dy, int32_t sx, int32_t sy, int32_t zoome);
-extern int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz) ATTRIBUTE((nonnull));
-extern int32_t getscreenvdisp(int32_t bz, int32_t zoome);
-extern void editorSetup2dSideView(void);
 
 extern int8_t keeptexturestretch;
 extern int16_t pointhighlightdist, linehighlightdist;
@@ -399,8 +379,6 @@ static inline int32_t m32_is2d3dmode(void)
         searchy > m32_2d3d.y && searchy < (m32_2d3d.y + YSIZE_2D3D);
 }
 
-extern int32_t editorGet2dSpriteColor(int32_t spr);
-
 #define SPRITESEC(j) (sector[sprite[j].sectnum])
 
 #define SCRIPTHISTSIZ 32  // should be the same as OSD_HISTORYDEPTH for maximum win, should be a power of two
@@ -460,8 +438,6 @@ static FORCE_INLINE void inpclamp(int32_t *x, int32_t mi, int32_t ma)
     if (*x < mi) *x = mi;
 }
 
-#define drawtranspixel(p, col) drawpixel(p, blendtable[0][(readpixel(p) * 256) + col])
-
 // Timed offset for Mapster32 color index cycling.
 // Range: 0 .. 16
 #define M32_THROB klabs(sintable[(((int32_t) totalclock << 4) & 2047)] >> 10)

source/build/include/pragmas.h

@@ -179,7 +179,7 @@ static FORCE_INLINE void swapchar2(void *a, void *b, int32_t s)
 #endif
 
 static FORCE_INLINE CONSTEXPR char readpixel(void *s) { return *(char *)s; }
-static FORCE_INLINE void drawpixel(void *s, char a) { *(char *)s = a; }
+
 
 #ifndef pragmas_have_klabs
 #if 0