From 4f54df65e92f691f94209f27ca0f3fedca0c9270 Mon Sep 17 00:00:00 2001 From: Michael Flaherty Date: Sun, 15 Oct 2017 02:32:01 -0700 Subject: [PATCH] Switch C header & Fix warnings (#702) --- core/logic/smn_float.cpp | 40 +------------------------------ extensions/sdkhooks/extension.cpp | 2 +- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/core/logic/smn_float.cpp b/core/logic/smn_float.cpp index 16aa972e..aabedf01 100644 --- a/core/logic/smn_float.cpp +++ b/core/logic/smn_float.cpp @@ -29,7 +29,7 @@ * Version: $Id$ */ -#include +#include #include #include #include "common_logic.h" @@ -288,44 +288,6 @@ static cell_t sm_ArcTangent2(IPluginContext *pCtx, const cell_t *params) return sp_ftoc(val1); } -#if 0 -static cell_t sm_FloatRound(IPluginContext *pCtx, const cell_t *params) -{ - float val = sp_ctof(params[1]); - - switch (params[2]) - { - case 1: - { - val = floor(val); - break; - } - case 2: - { - val = ceil(val); - break; - } - case 3: - { - if (val >= 0.0f) - { - val = floor(val); - } else { - val = ceil(val); - } - break; - } - default: - { - val = (float)floor(val + 0.5f); - break; - } - } - - return static_cast(val); -} -#endif - class RandomHelpers : public SMGlobalClass, public IPluginsListener diff --git a/extensions/sdkhooks/extension.cpp b/extensions/sdkhooks/extension.cpp index f7a64370..85a1de9d 100644 --- a/extensions/sdkhooks/extension.cpp +++ b/extensions/sdkhooks/extension.cpp @@ -957,7 +957,7 @@ bool SDKHooks::Hook_CanBeAutobalanced() // Only update our new ret if different from original // (so if multiple plugins returning different answers, // the one(s) that changed it win) - if (res != origRet) + if ((bool)res != origRet) newRet = !origRet; }