stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-26 04:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bit array conflicts

Browse source
This commit is contained in:
James R 2020-12-16 08:41:58 -08:00
parent 353692fa79
commit 4713b25837
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/lua_hooklib.c
View file

@ -38,18 +38,6 @@ static const char * const stringHookNames[] = {
STRING_HOOK_LIST (TOSTR) NULL
};
/* TODO: remove when doomtype version is merged */
#define BIT_ARRAY_LENGTH(n) (((n) + 7) >> 3)
static inline void set_bit_array (UINT8 *array, const int n) {
array[n >> 3] |= 1 << (n & 7);
}
static inline int in_bit_array (const UINT8 *array, const int n) {
return array[n >> 3] & (1 << (n & 7));
}
typedef struct {
int numHooks;
int *ids;
@ -215,7 +203,7 @@ static int lib_addHook(lua_State *L)
if (!(nextid & 7))
{
Z_Realloc(hooksErrored,
BIT_ARRAY_LENGTH (nextid + 1) * sizeof *hooksErrored,
BIT_ARRAY_SIZE (nextid + 1) * sizeof *hooksErrored,
PU_STATIC, &hooksErrored);
hooksErrored[nextid >> 3] = 0;
}