diff --git a/entWatch4/scripting/classes/CItem.inc b/entWatch4/scripting/classes/CItem.inc index 7c2413e8..e993453d 100644 --- a/entWatch4/scripting/classes/CItem.inc +++ b/entWatch4/scripting/classes/CItem.inc @@ -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); } } diff --git a/entWatch4/scripting/entWatch-core.sp b/entWatch4/scripting/entWatch-core.sp index ae2fcbb4..36413788 100644 --- a/entWatch4/scripting/entWatch-core.sp +++ b/entWatch4/scripting/entWatch-core.sp @@ -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; } } diff --git a/entWatch4/scripting/entWatch-interface.sp b/entWatch4/scripting/entWatch-interface.sp index 3d620594..67a79f42 100644 --- a/entWatch4/scripting/entWatch-interface.sp +++ b/entWatch4/scripting/entWatch-interface.sp @@ -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 {