diff --git a/dlls/engine/amxxapi.cpp b/dlls/engine/amxxapi.cpp index 2530f458..1e93a682 100755 --- a/dlls/engine/amxxapi.cpp +++ b/dlls/engine/amxxapi.cpp @@ -3,12 +3,8 @@ int AmxStringToEngine(AMX *amx, cell param, int &len) { char *szString = MF_GetAmxString(amx, param, 0, &len); - char *szCopy = new char[len+1]; - memset(szCopy, 0, len+1); - strcpy(szCopy, szString); - - return MAKE_STRING(szCopy); + return ALLOC_STRING(szString); } void OnAmxxAttach() diff --git a/dlls/engine/entity.cpp b/dlls/engine/entity.cpp index d8d16dac..c64b760b 100755 --- a/dlls/engine/entity.cpp +++ b/dlls/engine/entity.cpp @@ -5,7 +5,7 @@ int is_ent_valid(int iEnt) if (iEnt < 1 || iEnt > gpGlobals->maxEntities) return 0; - if (iEnt >= 1 || iEnt <= 32) + if (iEnt >= 1 && iEnt <= 32) if (!MF_IsPlayerIngame(iEnt)) return 0; @@ -91,7 +91,7 @@ static cell AMX_NATIVE_CALL force_use(AMX *amx, cell *params) edict_t *pUser = INDEXENT(iPtr); edict_t *pUsed = INDEXENT(iPtd); - MDLL_Touch(pUsed, pUser); + MDLL_Use(pUsed, pUser); return 1; }