From ec6b3912ec6751e13186e657c50186c9bdf1e13b Mon Sep 17 00:00:00 2001 From: Nexius Date: Fri, 19 Dec 2025 01:31:19 +0300 Subject: [PATCH 1/3] More optional parameters --- omp_npc.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omp_npc.inc b/omp_npc.inc index 1c5ff99..bc65fd4 100644 --- a/omp_npc.inc +++ b/omp_npc.inc @@ -560,7 +560,7 @@ native NPC_GetKeys(npcid, &upAnddown, &leftandRight, &keys); /** * omp_npc */ -native bool:NPC_MeleeAttack(npcid, time, bool:secondaryAttack = false); +native bool:NPC_MeleeAttack(npcid, time = -1, bool:secondaryAttack = false); /** * omp_npc @@ -642,7 +642,7 @@ native NPC_SetWeaponState(npcid, WEAPONSTATE:weaponState); * * */ -native NPC_Shoot(npcid, WEAPON:weaponid, hitId, hitType, Float:endPointX, Float:endPointY, Float:endPointZ, Float:offsetX, Float:offsetY, Float:offsetZ, bool:isHit, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); +native NPC_Shoot(npcid, WEAPON:weaponid, hitId, hitType, Float:endPointX, Float:endPointY, Float:endPointZ, Float:offsetX = 0.0, Float:offsetY = 0.0, Float:offsetZ = 0.0, bool:isHit = true, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); /** * omp_npc @@ -652,12 +652,12 @@ native bool:NPC_IsShooting(npcid); /** * omp_npc */ -native NPC_AimAt(npcid, Float:pointX, Float:pointY, Float:pointZ, bool:shoot, shootDelay, bool:updateAngle, Float:offsetFromX, Float:offsetFromY, Float:offsetFromZ, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); +native NPC_AimAt(npcid, Float:pointX, Float:pointY, Float:pointZ, bool:shoot = false, shootDelay = -1, bool:updateAngle = true, Float:offsetFromX = 0.0, Float:offsetFromY = 0.0, Float:offsetFromZ = 0.0, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); /** * omp_npc */ -native NPC_AimAtPlayer(npcid, playerid, bool:shoot, shootDelay, bool:updateAngle, Float:offsetX, Float:offsetY, Float:offsetZ, Float:offsetFromX, Float:offsetFromY, Float:offsetFromZ, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); +native NPC_AimAtPlayer(npcid, playerid, bool:shoot = false, shootDelay = -1, bool:updateAngle = true, Float:offsetX = 0.0, Float:offsetY = 0.0, Float:offsetZ = 0.0, Float:offsetFromX = 0.0, Float:offsetFromY = 0.0, Float:offsetFromZ = 0.0, NPC_ENTITY_CHECK:checkInBetweenFlags = NPC_ENTITY_CHECK_ALL); /** * omp_npc From f0dbd770a205922495d4fb5af83cfde019b02684 Mon Sep 17 00:00:00 2001 From: Nexius Date: Fri, 19 Dec 2025 03:08:08 +0300 Subject: [PATCH 2/3] Even more optional params, missed tags --- omp_npc.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/omp_npc.inc b/omp_npc.inc index bc65fd4..49608db 100644 --- a/omp_npc.inc +++ b/omp_npc.inc @@ -491,7 +491,7 @@ native Float:NPC_GetArmour(npcid); /** * omp_npc */ -native NPC_SetInvulnerable(npcid, bool:toggle); +native NPC_SetInvulnerable(npcid, bool:toggle = true); /** * omp_npc @@ -525,7 +525,7 @@ native NPC_SetWeapon(npcid, WEAPON:weaponid); /** * omp_npc */ -native NPC_GetWeapon(npcid); +native WEAPON:NPC_GetWeapon(npcid); /** * omp_npc @@ -580,12 +580,12 @@ native NPC_SetFightingStyle(npcid, FIGHT_STYLE:style); /** * omp_npc */ -native NPC_GetFightingStyle(npcid); +native FIGHT_STYLE:NPC_GetFightingStyle(npcid); /** * omp_npc */ -native bool:NPC_EnableReloading(npcid, bool:enable); +native bool:NPC_EnableReloading(npcid, bool:enable = true); /** * omp_npc @@ -600,7 +600,7 @@ native bool:NPC_IsReloading(npcid); /** * omp_npc */ -native bool:NPC_EnableInfiniteAmmo(npcid, bool:enable); +native bool:NPC_EnableInfiniteAmmo(npcid, bool:enable = true); /** * omp_npc @@ -610,7 +610,7 @@ native bool:NPC_IsInfiniteAmmoEnabled(npcid); /** * omp_npc */ -native NPC_GetWeaponState(npcid); +native WEAPONSTATE:NPC_GetWeaponState(npcid); /** * omp_npc @@ -862,7 +862,7 @@ native NPC_GetVehicleHydraThrusters(npcid); /** * omp_npc */ -native NPC_SetVehicleGearState(npcid, gearState); +native NPC_SetVehicleGearState(npcid, LANDING_GEAR_STATE:gearState); /** * omp_npc @@ -931,12 +931,12 @@ native /** * omp_npc */ -native bool:NPC_StartPlayback(npcid, const recordName[], bool:autoUnload, Float:startX, Float:startY, Float:startZ, Float:rotX, Float:rotY, Float:rotZ); +native bool:NPC_StartPlayback(npcid, const recordName[], bool:autoUnload = false, Float:startX = 0.0, Float:startY = 0.0, Float:startZ = 0.0, Float:rotX = 0.0, Float:rotY = 0.0, Float:rotZ = 0.0); /** * omp_npc */ -native bool:NPC_StartPlaybackEx(npcid, recordId, bool:autoUnload, Float:startX, Float:startY, Float:startZ, Float:rotX, Float:rotY, Float:rotZ); +native bool:NPC_StartPlaybackEx(npcid, recordId, bool:autoUnload = false, Float:startX = 0.0, Float:startY = 0.0, Float:startZ = 0.0, Float:rotX = 0.0, Float:rotY = 0.0, Float:rotZ = 0.0); /** * omp_npc @@ -946,7 +946,7 @@ native bool:NPC_StopPlayback(npcid); /** * omp_npc */ -native bool:NPC_PausePlayback(npcid, bool:paused); +native bool:NPC_PausePlayback(npcid, bool:paused = true); /** * omp_npc @@ -1072,7 +1072,7 @@ native NPC_GetPathCount(); /** * omp_npc */ -native bool:NPC_AddPointToPath(pathid, Float:x, Float:y, Float:z, Float:stopRange); +native bool:NPC_AddPointToPath(pathid, Float:x, Float:y, Float:z, Float:stopRange = 0.2); /** * omp_npc @@ -1092,7 +1092,7 @@ native NPC_GetPathPointCount(pathid); /** * omp_npc */ -native bool:NPC_GetPathPoint(pathid, pointIndex, &Float:x, &Float:y, &Float:z, &Float:stopRange); +native bool:NPC_GetPathPoint(pathid, pointIndex, &Float:x, &Float:y, &Float:z, &Float:stopRange = 0.2); /** * omp_npc From 03b1f5526b32b8361b20e4877bb4f46e4af03b63 Mon Sep 17 00:00:00 2001 From: Nexius Date: Fri, 19 Dec 2025 03:23:34 +0300 Subject: [PATCH 3/3] One more missed tag --- omp_npc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omp_npc.inc b/omp_npc.inc index 49608db..d396cc1 100644 --- a/omp_npc.inc +++ b/omp_npc.inc @@ -919,7 +919,7 @@ native NPC_SetSpecialAction(npcid, SPECIAL_ACTION:actionid); /** * omp_npc */ -native NPC_GetSpecialAction(npcid); +native SPECIAL_ACTION:NPC_GetSpecialAction(npcid); /* native # Playback();