Switch C header & Fix warnings (#702)

This commit is contained in:
Michael Flaherty 2017-10-15 02:32:01 -07:00 committed by Asher Baker
parent 36f9a8ed7a
commit 4f54df65e9
2 changed files with 2 additions and 40 deletions

View File

@ -29,7 +29,7 @@
* Version: $Id$ * Version: $Id$
*/ */
#include <math.h> #include <cmath>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "common_logic.h" #include "common_logic.h"
@ -288,44 +288,6 @@ static cell_t sm_ArcTangent2(IPluginContext *pCtx, const cell_t *params)
return sp_ftoc(val1); 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<int>(val);
}
#endif
class RandomHelpers : class RandomHelpers :
public SMGlobalClass, public SMGlobalClass,
public IPluginsListener public IPluginsListener

View File

@ -957,7 +957,7 @@ bool SDKHooks::Hook_CanBeAutobalanced()
// Only update our new ret if different from original // Only update our new ret if different from original
// (so if multiple plugins returning different answers, // (so if multiple plugins returning different answers,
// the one(s) that changed it win) // the one(s) that changed it win)
if (res != origRet) if ((bool)res != origRet)
newRet = !origRet; newRet = !origRet;
} }