From b980ca7b0b313810ac6210cf595e50a46ac4e3a2 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 8 Feb 2015 08:04:23 +0000 Subject: [PATCH] Engine: Remove some conditional disabling of spriteext features when !defined USE_OPENGL. git-svn-id: https://svn.eduke32.com/eduke32@4971 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/engine.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 13e5dfd35..b157d4f72 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -5852,11 +5852,7 @@ static void drawsprite_classic(int32_t snum) if ((cstat&48)==48) vtilenum = tilenum; // if the game wants voxels, it gets voxels - else if (usevoxels && tiletovox[tilenum] != -1 -#ifdef USE_OPENGL - && (!(spriteext[spritenum].flags&SPREXT_NOTMD)) -#endif - ) + else if (usevoxels && tiletovox[tilenum] != -1 && !(spriteext[spritenum].flags&SPREXT_NOTMD)) { vtilenum = tiletovox[tilenum]; cstat |= 48; @@ -6852,9 +6848,7 @@ draw_as_face_sprite: } i = (int32_t)tspr->ang+1536; -#ifdef USE_OPENGL i += spriteext[spritenum].angoff; -#endif drawvox(tspr->x,tspr->y,tspr->z,i,daxrepeat,(int32_t)tspr->yrepeat,vtilenum,tspr->shade,tspr->pal,lwall,swall); } } @@ -11078,7 +11072,6 @@ void delete_maphack_lights() {} // int32_t loadmaphack(const char *filename) { -#ifdef USE_OPENGL enum { T_SPRITE = 0, @@ -11377,10 +11370,6 @@ int32_t loadmaphack(const char *filename) scriptfile_close(script); return 0; -#else - UNREFERENCED_PARAMETER(filename); - return -1; -#endif }