Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #367 from Arkshine/fix/engine-typos

Browse Source 
Fix typos in entity_intersects() and get_global_edict2() natives
This commit is contained in:
Vincent Herbet 2016-04-11 11:28:19 +02:00
commit ccf8026761
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/engine/entity.cpp
View File

@ -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.y < pevEntity->absmin.y ||
pevOther->absmax.z < pevEntity->absmin.z) pevOther->absmax.z < pevEntity->absmin.z)
{ {
return 1; return 0;
} }
return 0; return 1;
} }
AMX_NATIVE_INFO ent_NewNatives[] = AMX_NATIVE_INFO ent_NewNatives[] =

5
modules/engine/globals.cpp
View File

@ -170,12 +170,7 @@ static cell AMX_NATIVE_CALL get_global_edict2(AMX *amx, cell *params)
return -1; return -1;
} }
if (!FNullEnt(pReturnEntity))
{
return TypeConversion.edict_to_id(pReturnEntity); return TypeConversion.edict_to_id(pReturnEntity);
}
return -1;
} }
static cell AMX_NATIVE_CALL get_global_edict(AMX *amx, cell *params) // globals_get_edict(variable); = 1 param static cell AMX_NATIVE_CALL get_global_edict(AMX *amx, cell *params) // globals_get_edict(variable); = 1 param