Fix USE_OPENGL=0 build.

git-svn-id: https://svn.eduke32.com/eduke32@5332 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-08-15 21:28:49 +00:00
parent 2303da6d7c
commit c052540d42
2 changed files with 10 additions and 0 deletions

View file

@ -3812,12 +3812,16 @@ void overheadeditor(void)
// 2d3d mode // 2d3d mode
if (m32_2d3dmode && m32_2d3d_resolutions_match()) if (m32_2d3dmode && m32_2d3d_resolutions_match())
{ {
#ifdef USE_OPENGL
int bakrendmode = rendmode; int bakrendmode = rendmode;
#endif
vec2_t bdim ={ xdim, ydim }; vec2_t bdim ={ xdim, ydim };
xdim = xdim2d; xdim = xdim2d;
ydim = ydim2d; ydim = ydim2d;
#ifdef USE_OPENGL
rendmode = REND_CLASSIC; rendmode = REND_CLASSIC;
#endif
if (m32_2d3d.x + XSIZE_2D3D > xdim2d - 4) if (m32_2d3d.x + XSIZE_2D3D > xdim2d - 4)
m32_2d3d.x = xdim2d - 4 - XSIZE_2D3D; m32_2d3d.x = xdim2d - 4 - XSIZE_2D3D;
@ -3850,7 +3854,9 @@ void overheadeditor(void)
M32_DrawRoomsAndMasks(); M32_DrawRoomsAndMasks();
setview(0, 0, xdim2d-1, ydim2d-1); setview(0, 0, xdim2d-1, ydim2d-1);
#ifdef USE_OPENGL
rendmode = bakrendmode; rendmode = bakrendmode;
#endif
xdim = bdim.x; xdim = bdim.x;
ydim = bdim.y; ydim = bdim.y;
searchx = osearch.x; searchx = osearch.x;

View file

@ -10692,17 +10692,21 @@ void ExtCheckKeys(void)
// 2d3d mode // 2d3d mode
if ((in3dmode() && !m32_is2d3dmode()) || m32_is2d3dmode()) if ((in3dmode() && !m32_is2d3dmode()) || m32_is2d3dmode())
{ {
#ifdef USE_OPENGL
int bakrendmode = rendmode; int bakrendmode = rendmode;
if (m32_is2d3dmode()) if (m32_is2d3dmode())
rendmode = REND_CLASSIC; rendmode = REND_CLASSIC;
#endif
Keys3d(); Keys3d();
editinput(); editinput();
if (infobox&2) if (infobox&2)
m32_showmouse(); m32_showmouse();
#ifdef USE_OPENGL
rendmode = bakrendmode; rendmode = bakrendmode;
#endif
} }
else if (!in3dmode()) else if (!in3dmode())
{ {