Compare commits

...

2 Commits

Author SHA1 Message Date
zaCade
786225b6a2 [entWatch-core] Fix native bound check. 2025-03-09 16:35:06 +01:00
zaCade
b824afd1a3 [entWatch-beacon] Formatting, change event hook to void. 2025-03-09 16:34:33 +01:00
2 changed files with 13 additions and 13 deletions

View File

@ -40,14 +40,16 @@ public void OnPluginStart()
HookEvent("round_start", Event_RoundStart, EventHookMode_Pre); HookEvent("round_start", Event_RoundStart, EventHookMode_Pre);
} }
public Action Event_RoundStart(Event event, const char[] name, bool dontBroadcast) //----------------------------------------------------------------------------------------------------
// Purpose:
//----------------------------------------------------------------------------------------------------
public void Event_RoundStart(Event event, const char[] name, bool dontBroadcast)
{ {
for (int i = 0; i < sizeof(g_bDropped); i++) for (int i = 0; i < sizeof(g_bDropped); i++)
{ {
g_bDropped[i] = false; g_bDropped[i] = false;
g_bActive[i] = false; g_bActive[i] = false;
} }
return Plugin_Continue;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
@ -142,7 +144,7 @@ public Action Timer_Beacon(Handle timer, any index)
return Plugin_Stop; return Plugin_Stop;
} }
CConfig cfg = item.dConfig ; CConfig cfg = item.dConfig;
if (cfg.iMode == 2 && item.iTimesUsed >= cfg.iMaxUses) if (cfg.iMode == 2 && item.iTimesUsed >= cfg.iMaxUses)
{ {
@ -151,7 +153,7 @@ public Action Timer_Beacon(Handle timer, any index)
} }
float fOrigin[3]; float fOrigin[3];
GetEntPropVector(item.iWeapon, Prop_Send, "m_vecOrigin", fOrigin) GetEntPropVector(item.iWeapon, Prop_Send, "m_vecOrigin", fOrigin);
char sColor[32]; char sColor[32];
item.dConfig.GetColor(sColor, sizeof(sColor)); item.dConfig.GetColor(sColor, sizeof(sColor));
@ -165,10 +167,8 @@ public Action Timer_Beacon(Handle timer, any index)
iVecColor[2] = ((iColor >> 0) & 0xFF); iVecColor[2] = ((iColor >> 0) & 0xFF);
iVecColor[3] = 255 iVecColor[3] = 255
TE_SetupBeamRingPoint(fOrigin, 5.0, 50.0, g_iBeamSprite, g_iHaloSprite, 0, 10, 0.6, 6.0, 0.5, iVecColor, 10, 0); TE_SetupBeamRingPoint(fOrigin, 5.0, 50.0, g_iBeamSprite, g_iHaloSprite, 0, 10, 0.6, 6.0, 0.5, iVecColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
return Plugin_Continue; return Plugin_Continue;
} }

View File

@ -749,7 +749,7 @@ public int Native_GetItemData(Handle hPlugin, int numParams)
{ {
int index = GetNativeCell(1); int index = GetNativeCell(1);
if ((index < 0) || (index > g_hArray_Items.Length)) if ((index < 0) || (index >= g_hArray_Items.Length))
{ {
return ThrowNativeError(SP_ERROR_INDEX, "Item index %d is invalid.", index); return ThrowNativeError(SP_ERROR_INDEX, "Item index %d is invalid.", index);
} }