From d91144a10dd1c6775c5da5b341240b15b8fd46bc Mon Sep 17 00:00:00 2001 From: Arkshine Date: Thu, 31 Mar 2016 19:37:12 +0200 Subject: [PATCH] Fix typos in entity_intersects() and get_global_edict2() natives --- modules/engine/entity.cpp | 4 ++-- modules/engine/globals.cpp | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/engine/entity.cpp b/modules/engine/entity.cpp index 23a78edf..fc31ec8a 100644 --- a/modules/engine/entity.cpp +++ b/modules/engine/entity.cpp @@ -1568,10 +1568,10 @@ static cell AMX_NATIVE_CALL entity_intersects(AMX *amx, cell *params) // bool:en pevOther->absmax.y < pevEntity->absmin.y || pevOther->absmax.z < pevEntity->absmin.z) { - return 1; + return 0; } - return 0; + return 1; } AMX_NATIVE_INFO ent_NewNatives[] = diff --git a/modules/engine/globals.cpp b/modules/engine/globals.cpp index d914a029..5b41e282 100644 --- a/modules/engine/globals.cpp +++ b/modules/engine/globals.cpp @@ -170,12 +170,7 @@ static cell AMX_NATIVE_CALL get_global_edict2(AMX *amx, cell *params) return -1; } - if (!FNullEnt(pReturnEntity)) - { - return TypeConversion.edict_to_id(pReturnEntity); - } - - return -1; + return TypeConversion.edict_to_id(pReturnEntity); } static cell AMX_NATIVE_CALL get_global_edict(AMX *amx, cell *params) // globals_get_edict(variable); = 1 param