From afa3009f93cb8f41272a313140f2427f47ab3556 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Thu, 21 Apr 2016 16:07:41 +0200 Subject: [PATCH] - Fixed a GCC/Clang compiler error and a warning. --- src/p_ceiling.cpp | 2 +- src/r_main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index 9c5d693a0..8a0c8f9ef 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -253,7 +253,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t // if ceiling already moving, don't start a second function on it if (sec->PlaneMoving(sector_t::ceiling)) { - return NULL; + return false; } // new door thinker diff --git a/src/r_main.cpp b/src/r_main.cpp index 1344ac453..f6a341f4e 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -693,7 +693,7 @@ void R_EnterPortal (PortalDrawseg* pds, int depth) fixed_t starty = viewy; fixed_t startz = viewz; DVector3 savedpath[2] = { ViewPath[0], ViewPath[1] }; - int savedvisibility = camera? camera->renderflags & RF_INVISIBLE : 0; + ActorRenderFlags savedvisibility = camera? camera->renderflags & RF_INVISIBLE : ActorRenderFlags::FromInt(0); CurrentPortalUniq++;