UNLOZE/sm-plugins
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

entWatch4: fix 1 second cooldown delay?

Browse Source
This commit is contained in:
BotoX 2019-10-30 23:15:10 +01:00
parent f08ec189ac
commit bf93a52f24
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
entWatch4/scripting/classes/CItem.inc
View File

@ -18,7 +18,7 @@ methodmap CItem < Basic
myclass.SetInt("iTrigger", INVALID_ENT_REFERENCE);
myclass.SetInt("iTimesUsed", 0);
myclass.SetInt("iTimeReady", 0);
myclass.SetFloat("flTimeReady", 0.0);
myclass.SetFloat("flWait", 0.0);
@ -100,15 +100,15 @@ methodmap CItem < Basic
}
}
property int iTimeReady
property float flTimeReady
{
public get()
{
return this.GetInt("iTimeReady");
return this.GetFloat("flTimeReady");
}
public set(int value)
public set(float value)
{
this.SetInt("iTimeReady", value);
this.SetFloat("flTimeReady", value);
}
}

12
entWatch4/scripting/entWatch-core.sp
View File

@ -613,9 +613,9 @@ public Action OnButtonPress(int button, int client)
{
case MODE_COOLDOWN:
{
if (item.iTimeReady < RoundToCeil(GetEngineTime()))
if (item.flTimeReady < GetEngineTime())
{
item.iTimeReady = RoundToCeil(GetEngineTime()) + item.dConfig.iCooldown;
item.flTimeReady = GetEngineTime() + item.dConfig.iCooldown;
}
else return Plugin_Handled;
}
@ -629,22 +629,22 @@ public Action OnButtonPress(int button, int client)
}
case MODE_COOLDOWNMAXUSES:
{
if (item.iTimeReady < RoundToCeil(GetEngineTime()) && item.iTimesUsed < item.dConfig.iMaxUses)
if (item.flTimeReady < GetEngineTime() && item.iTimesUsed < item.dConfig.iMaxUses)
{
item.iTimeReady = RoundToCeil(GetEngineTime()) + item.dConfig.iCooldown;
item.flTimeReady = GetEngineTime() + item.dConfig.iCooldown;
item.iTimesUsed++;
}
else return Plugin_Handled;
}
case MODE_COOLDOWNCHARGES:
{
if (item.iTimeReady < RoundToCeil(GetEngineTime()))
if (item.flTimeReady < GetEngineTime())
{
item.iTimesUsed++;
if (item.iTimesUsed >= item.dConfig.iMaxUses)
{
item.iTimeReady = RoundToCeil(GetEngineTime()) + item.dConfig.iCooldown;
item.flTimeReady = GetEngineTime() + item.dConfig.iCooldown;
item.iTimesUsed = 0;
}
}

12
entWatch4/scripting/entWatch-interface.sp
View File

@ -112,9 +112,9 @@ public Action OnDisplayHUD(Handle timer)
{
case MODE_COOLDOWN:
{
if (item.iTimeReady > RoundToCeil(GetEngineTime()))
if (item.flTimeReady > GetEngineTime())
{
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, item.iTimeReady - RoundToCeil(GetEngineTime()), item.iClient);
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, RoundToCeil(item.flTimeReady - GetEngineTime()), item.iClient);
}
else
{
@ -136,9 +136,9 @@ public Action OnDisplayHUD(Handle timer)
{
if (item.iTimesUsed < item.dConfig.iMaxUses)
{
if (item.iTimeReady > RoundToCeil(GetEngineTime()))
if (item.flTimeReady > GetEngineTime())
{
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, item.iTimeReady - RoundToCeil(GetEngineTime()), item.iClient);
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, RoundToCeil(item.flTimeReady - GetEngineTime()), item.iClient);
}
else
{
@ -152,9 +152,9 @@ public Action OnDisplayHUD(Handle timer)
}
case MODE_COOLDOWNCHARGES:
{
if (item.iTimeReady > RoundToCeil(GetEngineTime()))
if (item.flTimeReady > GetEngineTime())
{
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, item.iTimeReady - RoundToCeil(GetEngineTime()), item.iClient);
Format(sLine, sizeof(sLine), "%s [%d]: %N", sShort, RoundToCeil(item.flTimeReady - GetEngineTime()), item.iClient);
}
else
{