Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2016-05-27 14:39:23 -04:00
commit 9731a8daa1
2 changed files with 7 additions and 2 deletions

View file

@ -366,7 +366,12 @@ ifdef DEBUGMODE
# build with debugging information
WINDRESFLAGS = -D_DEBUG
CFLAGS+=-O0 -Wall -DPARANOIA -DRANGECHECK
ifdef GCC48
CFLAGS+=-Og
else
CFLAGS+=-O0
endif
CFLAGS+= -Wall -DPARANOIA -DRANGECHECK
else

View file

@ -999,7 +999,7 @@ static inline void AM_drawWalls(void)
static mline_t l;
#ifdef ESLOPE
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
fixed_t backf1 = 0, backf2 = 0, backc1 = 0, backc2 = 0; // back floor ceiling ends
#endif
for (i = 0; i < numlines; i++)