diff --git a/.travis.yml b/.travis.yml index 01660248..f1996215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,4 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi - mkdir -p $HOME/srb2_cache -script: make +script: make -k diff --git a/appveyor.yml b/appveyor.yml index f9e7b3ba..fd949dbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,7 +51,7 @@ before_build: build_script: - cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean -- cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 ERRORMODE=1 +- cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 ERRORMODE=1 -k after_build: - ccache -s diff --git a/src/Makefile b/src/Makefile index 463afccc..f43e3c24 100644 --- a/src/Makefile +++ b/src/Makefile @@ -372,7 +372,7 @@ else # build a normal optimised version WINDRESFLAGS = -DNDEBUG - #CFLAGS+=-O2 + CFLAGS+=-O3 endif CFLAGS+=-g $(OPTS) $(M5) $(WINDRESFLAGS) diff --git a/src/Makefile.cfg b/src/Makefile.cfg index fa8896a7..347efa5e 100644 --- a/src/Makefile.cfg +++ b/src/Makefile.cfg @@ -173,6 +173,9 @@ endif ifdef GCC43 #WFLAGS+=-Wno-error=clobbered endif +ifdef GCC46 + WFLAGS+=-Wno-error=suggest-attribute=noreturn +endif WFLAGS+=$(OLDWFLAGS) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 5fb6a93f..bec9cdb1 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3280,16 +3280,18 @@ static void HWR_AddPolyObjectPlanes(void) if (po_ptrs[i]->translucency > 0) { FSurfaceInfo Surf; - FBITFIELD blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf); + FBITFIELD blendmode; + memset(&Surf, 0x00, sizeof(Surf)); + blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf); HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], polyobjsector->ceilingheight, - polyobjsector->lightlevel, Surf.FlatColor.s.alpha, polyobjsector, blendmode, NULL); + polyobjsector->lightlevel, Surf.FlatColor.s.alpha, polyobjsector, blendmode, NULL); } else { HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum); HWR_RenderPolyObjectPlane(po_ptrs[i], polyobjsector->ceilingheight, PF_Occlude, - polyobjsector->lightlevel, levelflats[polyobjsector->floorpic].lumpnum, - polyobjsector, 255, NULL); + polyobjsector->lightlevel, levelflats[polyobjsector->floorpic].lumpnum, + polyobjsector, 255, NULL); } } } diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 31a510d8..8e48ec11 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1387,10 +1387,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr) // SRB2CBTODO: MD2 scaling support finalscale *= FIXED_TO_FLOAT(spr->mobj->scale); - if (postimgtype == postimg_flip) - p.flip = true; - else - p.flip = false; + p.flip = atransform.flip; HWD.pfnDrawMD2i(buff, curr, durs, tics, next, &p, finalscale, flip, color); } diff --git a/src/p_saveg.c b/src/p_saveg.c index 975232ba..5e457ca3 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -108,7 +108,7 @@ static inline void P_UnArchivePlayer(void) // // P_NetArchivePlayers // -static inline void P_NetArchivePlayers(void) +static void P_NetArchivePlayers(void) { INT32 i, j; UINT16 flags; @@ -280,7 +280,7 @@ static inline void P_NetArchivePlayers(void) // // P_NetUnArchivePlayers // -static inline void P_NetUnArchivePlayers(void) +static void P_NetUnArchivePlayers(void) { INT32 i, j; UINT16 flags;