diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6152dfa..ffdcf3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: ambuild - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ runner.os }} path: extension/build/package diff --git a/extension.cpp b/extension.cpp index 6789e95..12c0bae 100644 --- a/extension.cpp +++ b/extension.cpp @@ -433,7 +433,7 @@ DETOUR_DECL_STATIC2(DETOUR_CreateEntityByName, CBaseEntity*, const char*, classN DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *, szValue) { - CBaseEntity *pEntity = (CBaseEntity *)this; + CBaseEntity *pEntity = (CBaseEntity *)this; // Fix crash bug in engine if(strcasecmp(szKeyName, "angle") == 0) @@ -454,9 +454,9 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char * if(pClassname && strcasecmp(pClassname, "func_buyzone") == 0) szValue = "3"; } - else if(strcasecmp(szKeyName, "absvelocity") == 0) - { - static int m_AbsVelocity_offset = 0; + else if(strcasecmp(szKeyName, "absvelocity") == 0) + { + static int m_AbsVelocity_offset = 0; if (!m_AbsVelocity_offset) { @@ -472,7 +472,7 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char * Vector *vecAbsVelocity = (Vector*)((uint8_t*)pEntity + m_AbsVelocity_offset); vecAbsVelocity->Init(tmp[0], tmp[1], tmp[2]); - } + } return DETOUR_MEMBER_CALL(DETOUR_KeyValue)(szKeyName, szValue); } @@ -489,6 +489,9 @@ DETOUR_DECL_MEMBER0(DETOUR_FindUseEntity, CBaseEntity *) } DETOUR_DECL_MEMBER3(DETOUR_CTraceFilterSimple, void, const IHandleEntity *, passedict, int, collisionGroup, ShouldHitFunc_t, pExtraShouldHitFunc) { + if (passedict == nullptr || pExtraShouldHitFunc == nullptr) + return; + DETOUR_MEMBER_CALL(DETOUR_CTraceFilterSimple)(passedict, collisionGroup, pExtraShouldHitFunc); // If we're in FindUseEntity right now then switch out the VTable @@ -637,7 +640,7 @@ bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late) { srand((unsigned int)time(NULL)); - g_iMaxPlayers = playerhelpers->GetMaxClients(); + g_iMaxPlayers = playerhelpers->GetMaxClients(); char conf_error[255] = ""; if(!gameconfs->LoadGameConfigFile("CSSFixes.games", &g_pGameConf, conf_error, sizeof(conf_error))) diff --git a/smsdk_config.h b/smsdk_config.h index b92f5a6..a72c46b 100644 --- a/smsdk_config.h +++ b/smsdk_config.h @@ -40,7 +40,7 @@ /* Basic information exposed publicly */ #define SMEXT_CONF_NAME "CSSFixes" #define SMEXT_CONF_DESCRIPTION "Patches bugs in the CSS server binary and more..." -#define SMEXT_CONF_VERSION "1.18" +#define SMEXT_CONF_VERSION "1.18.1" #define SMEXT_CONF_AUTHOR "BotoX" #define SMEXT_CONF_URL "" #define SMEXT_CONF_LOGTAG "CSSFIXES"