From 0387282e379816460bc538ccf496c28759ee5d8f Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 26 Mar 2023 15:35:20 +1100 Subject: [PATCH] - Fix two particularly loud warnings from GCC builds. * `warning: type qualifiers ignored on function return type`. --- source/core/gameinput.h | 2 +- source/core/textures/texinfo.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/gameinput.h b/source/core/gameinput.h index c82061a67..a579a8015 100644 --- a/source/core/gameinput.h +++ b/source/core/gameinput.h @@ -23,7 +23,7 @@ struct PlayerAngles // General methods. void initialize(DCoreActor* const actor, const DAngle viewyaw = nullAngle) { - if (pActor = actor) CameraAngles = PrevLerpAngles = pActor->spr.Angles; + if ((pActor = actor)) CameraAngles = PrevLerpAngles = pActor->spr.Angles; PrevViewAngles.Yaw = ViewAngles.Yaw = viewyaw; } DAngle getPitchWithView() diff --git a/source/core/textures/texinfo.h b/source/core/textures/texinfo.h index 23142dcce..b961ee8cd 100644 --- a/source/core/textures/texinfo.h +++ b/source/core/textures/texinfo.h @@ -184,12 +184,12 @@ inline const TileOffs* GetHiresOffset(FTextureID tex) else return nullptr; } -inline const unsigned tileflags(FTextureID texid) +inline unsigned tileflags(FTextureID texid) { return GetExtInfo(texid).flags; } -inline const uint8_t tilesurface(FTextureID texid) +inline uint8_t tilesurface(FTextureID texid) { return GetExtInfo(texid).surftype; }