UNLOZE/sm-ext-TransmitManager
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linux build

Browse Source
This commit is contained in:
Kyle
2020-08-12 09:15:27 +08:00
parent df7ece96de
commit 90f8323ddc
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -9,7 +9,7 @@ env:
- DEPS_DIR=${HOME}/deps - DEPS_DIR=${HOME}/deps
- BRANCH=1.10-dev - BRANCH=1.10-dev
before_install: before_install:
- git clone https://github.com/alliedmodders/ambuild ${DEPS_DIR}/ambuild - git clone -b 2.1 https://github.com/alliedmodders/ambuild ${DEPS_DIR}/ambuild
jobs: jobs:
include: include:
- name: Linux - name: Linux
extension.cpp
+8 -17
View File
@@ -4,8 +4,6 @@
#pragma comment(lib, "legacy_stdio_definitions.lib") #pragma comment(lib, "legacy_stdio_definitions.lib")
#endif #endif
constexpr auto MAX_EDICT = 2048;
TransmitManager g_Transmit; TransmitManager g_Transmit;
SMEXT_LINK(&g_Transmit); SMEXT_LINK(&g_Transmit);
@@ -92,7 +90,7 @@ private:
bool bRemoveFlags; bool bRemoveFlags;
}; };
HookingEntity* g_Hooked[MAX_EDICT]; HookingEntity* g_Hooked[MAX_EDICTS];
void TransmitManager::Hook_SetTransmit(CCheckTransmitInfo* pInfo, bool bAlways) void TransmitManager::Hook_SetTransmit(CCheckTransmitInfo* pInfo, bool bAlways)
{ {
@@ -101,7 +99,7 @@ void TransmitManager::Hook_SetTransmit(CCheckTransmitInfo* pInfo, bool bAlways)
auto *edict = gamehelpers->EdictOfIndex(entity); auto *edict = gamehelpers->EdictOfIndex(entity);
auto client = gamehelpers->IndexOfEdict(pInfo->m_pClientEnt); auto client = gamehelpers->IndexOfEdict(pInfo->m_pClientEnt);
if (entity > MAX_EDICT || entity < 1 || client == entity || !edict || edict->IsFree()) if (!IsEntityIndexInRange(entity) || client == entity || !edict || edict->IsFree())
{ {
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
@@ -179,7 +177,7 @@ void TransmitManager::SDK_OnUnload()
playerhelpers->RemoveClientListener(this); playerhelpers->RemoveClientListener(this);
g_pSDKHooks->RemoveEntityListener(this); g_pSDKHooks->RemoveEntityListener(this);
for (auto i = 0; i < MAX_EDICT; i++) for (auto i = 0; i < MAX_EDICTS; i++)
{ {
if (g_Hooked[i] != nullptr) if (g_Hooked[i] != nullptr)
{ {
@@ -190,14 +188,7 @@ void TransmitManager::SDK_OnUnload()
void TransmitManager::OnEntityDestroyed(CBaseEntity* pEntity) void TransmitManager::OnEntityDestroyed(CBaseEntity* pEntity)
{ {
if (!pEntity) auto entity = gamehelpers->EntityToBCompatRef(pEntity);
{
smutils->LogError(myself, "OnEntityDestroyed -> nullptr detected...");
return;
}
auto entRef = gamehelpers->EntityToReference(pEntity);
auto entity = gamehelpers->ReferenceToIndex(entRef);
if ((unsigned)entity == INVALID_EHANDLE_INDEX || (entity > 0 && entity <= playerhelpers->GetMaxClients())) if ((unsigned)entity == INVALID_EHANDLE_INDEX || (entity > 0 && entity <= playerhelpers->GetMaxClients()))
{ {
@@ -222,7 +213,7 @@ void TransmitManager::OnClientPutInServer(int client)
return; return;
} }
for (auto i = 1; i < MAX_EDICT; i++) for (auto i = 1; i < MAX_EDICTS; i++)
{ {
if (g_Hooked[i] == nullptr) if (g_Hooked[i] == nullptr)
{ {
@@ -289,7 +280,7 @@ void TransmitManager::UnhookEntity(int index)
static cell_t Native_SetEntityOwner(IPluginContext* pContext, const cell_t* params) static cell_t Native_SetEntityOwner(IPluginContext* pContext, const cell_t* params)
{ {
if (!(params[1] >= 1 && params[1] < MAX_EDICT)) if (!(params[1] >= 1 && params[1] < MAX_EDICTS))
{ {
// out-of-range // out-of-range
return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]); return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]);
@@ -306,7 +297,7 @@ static cell_t Native_SetEntityOwner(IPluginContext* pContext, const cell_t* para
static cell_t Native_SetEntityState(IPluginContext* pContext, const cell_t* params) static cell_t Native_SetEntityState(IPluginContext* pContext, const cell_t* params)
{ {
if (!(params[1] >= 1 && params[1] < MAX_EDICT)) if (!(params[1] >= 1 && params[1] < MAX_EDICTS))
{ {
// out-of-range // out-of-range
return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]); return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]);
@@ -329,7 +320,7 @@ static cell_t Native_SetEntityState(IPluginContext* pContext, const cell_t* para
static cell_t Native_AddEntityHooks(IPluginContext* pContext, const cell_t* params) static cell_t Native_AddEntityHooks(IPluginContext* pContext, const cell_t* params)
{ {
if (!(params[1] >= 1 && params[1] < MAX_EDICT)) if (!(params[1] >= 1 && params[1] < MAX_EDICTS))
{ {
// out-of-range // out-of-range
return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]); return pContext->ThrowNativeError("Entity %d is out-of-range.", params[1]);