markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed android compiling

Browse source
This commit is contained in:
jeefo 2016-09-16 22:55:31 +03:00
commit 8527f0a34b
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/corelib.h
View file

@ -47,6 +47,7 @@ typedef unsigned long uint32;
// Own min/max implementation // Own min/max implementation
template <typename T> inline T A_min (T a, T b) { return a < b ? a : b; } template <typename T> inline T A_min (T a, T b) { return a < b ? a : b; }
template <typename T> inline T A_max (T a, T b) { return a > b ? a : b; } template <typename T> inline T A_max (T a, T b) { return a > b ? a : b; }
template <typename T> inline T A_clamp (T x, T a, T b) { return A_min (A_max (x, a), b); }
// Fast stricmp got somewhere from chromium // Fast stricmp got somewhere from chromium
static inline int A_stricmp (const char *str1, const char *str2, int length = -1) static inline int A_stricmp (const char *str1, const char *str2, int length = -1)
@ -386,11 +387,6 @@ namespace Math
{ {
return AngleNormalize (destAngle - srcAngle); return AngleNormalize (destAngle - srcAngle);
} }
template <typename Type> Type Clamp (Type x, Type a, Type b)
{
return (x < a) ? a : ((x > b) ? b : x);
}
} }
// //

2
source/manager.cpp
View file

@ -1271,7 +1271,7 @@ void Bot::Kick (bool keepQuota)
// keep quota number up to date // keep quota number up to date
if (!keepQuota) if (!keepQuota)
yb_quota.SetInt (Clamp <int> (yb_quota.GetInt () - 1, 0, yb_quota.GetInt ())); yb_quota.SetInt (A_clamp <int> (yb_quota.GetInt () - 1, 0, yb_quota.GetInt ()));
} }
void Bot::StartGame (void) void Bot::StartGame (void)

2
source/navigate.cpp
View file

@ -3162,7 +3162,7 @@ void Bot::UpdateBodyAngles (void)
void Bot::UpdateLookAngles (void) void Bot::UpdateLookAngles (void)
{ {
const float delta = Clamp <float> (engine.Time () - m_lookUpdateTime, MATH_EQEPSILON, 0.05f); const float delta = A_clamp <float> (engine.Time () - m_lookUpdateTime, MATH_EQEPSILON, 0.05f);
m_lookUpdateTime = engine.Time (); m_lookUpdateTime = engine.Time ();
// adjust all body and view angles to face an absolute vector // adjust all body and view angles to face an absolute vector