UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add static_assert on ConBitVecAndNot hack so it gets updated on next cond count change.

Browse Source
This commit is contained in:
Nicholas Hastings 2014-11-15 11:31:18 -05:00
parent 1cf43b4ec2
commit d3a4c972e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/tf2/conditions.cpp
View File

@ -37,7 +37,9 @@
#include <bitvec.h> #include <bitvec.h>
typedef CBitVec<128> condbitvec_t; const int TF_MAX_CONDITIONS = 128;
typedef CBitVec<TF_MAX_CONDITIONS> condbitvec_t;
condbitvec_t g_PlayerActiveConds[SM_MAXPLAYERS + 1]; condbitvec_t g_PlayerActiveConds[SM_MAXPLAYERS + 1];
IForward *g_addCondForward = NULL; IForward *g_addCondForward = NULL;
@ -68,6 +70,8 @@ inline void GetPlayerConds(CBaseEntity *pPlayer, condbitvec_t *pOut)
inline void CondBitVecAndNot(const condbitvec_t &src, const condbitvec_t &addStr, condbitvec_t *out) inline void CondBitVecAndNot(const condbitvec_t &src, const condbitvec_t &addStr, condbitvec_t *out)
{ {
static_assert(TF_MAX_CONDITIONS == 128, "CondBitVecAndNot hack is hardcoded for 128-bit bitvec.");
// CBitVec has And and Not, but not a simple, combined AndNot. // CBitVec has And and Not, but not a simple, combined AndNot.
// We'll also treat the halves as two 64-bit ints instead of four 32-bit ints // We'll also treat the halves as two 64-bit ints instead of four 32-bit ints
// as a minor optimization (maybe?) that the compiler is not making itself. // as a minor optimization (maybe?) that the compiler is not making itself.