From 1448ceeee1bdc16dfa3522da25a9ea5b3cdfbeb2 Mon Sep 17 00:00:00 2001 From: BotoX Date: Sat, 4 Feb 2017 23:30:54 +0100 Subject: [PATCH] minor fixes. --- ForceInputs/scripting/ForceInputs.sp | 4 ++-- Status/scripting/Status.sp | 4 ++-- includes/outputinfo.inc | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ForceInputs/scripting/ForceInputs.sp b/ForceInputs/scripting/ForceInputs.sp index 03f066f1..8d6269f0 100644 --- a/ForceInputs/scripting/ForceInputs.sp +++ b/ForceInputs/scripting/ForceInputs.sp @@ -142,8 +142,8 @@ public Action Command_ForceInput(int client, int args) int entity = INVALID_ENT_REFERENCE; while((entity = FindEntityByClassname(entity, "*")) != INVALID_ENT_REFERENCE) { - static char sClassname[64]; - static char sTargetname[64]; + char sClassname[64]; + char sTargetname[64]; GetEntPropString(entity, Prop_Data, "m_iClassname", sClassname, sizeof(sClassname)); GetEntPropString(entity, Prop_Data, "m_iName", sTargetname, sizeof(sTargetname)); diff --git a/Status/scripting/Status.sp b/Status/scripting/Status.sp index d63eb560..44d86500 100644 --- a/Status/scripting/Status.sp +++ b/Status/scripting/Status.sp @@ -98,10 +98,10 @@ public Action Command_Status(int client, const char[] command, int args) sServerName); #if defined _serverfps_included - PrintToConsole(client, "tickrate : %.2f/%.2f (%d%%%%)", + PrintToConsole(client, "tickrate : %.2f/%.2f (%d%%)", fServerFPS, fServerTickRate, RoundToNearest((fServerFPS / fServerTickRate) * 100)); #else - PrintToConsole(client, "tickrate : %d/%d (%d%%%%)", + PrintToConsole(client, "tickrate : %d/%d (%d%%)", iTickRate, iServerTickRate, RoundToNearest((float(iTickRate) / float(iServerTickRate)) * 100)); #endif diff --git a/includes/outputinfo.inc b/includes/outputinfo.inc index 43964272..1e5f5b6a 100644 --- a/includes/outputinfo.inc +++ b/includes/outputinfo.inc @@ -4,11 +4,19 @@ #define _OutputInfo_Included native int GetOutputCount(int Entity, const char[] sOutput); + native int GetOutputTarget(int Entity, const char[] sOutput, int Index, char[] sTarget, int MaxLen); native int GetOutputTargetInput(int Entity, const char[] sOutput, int Index, char[] sTargetInput, int MaxLen); native int GetOutputParameter(int Entity, const char[] sOutput, int Index, char[] sParameter, int MaxLen); native float GetOutputDelay(int Entity, const char[] sOutput, int Index); + native int GetOutputFormatted(int Entity, const char[] sOutput, int Index, char[] sFormatted, int MaxLen); + +native int GetOutputValue(int Entity, const char[] sOutput); +native float GetOutputValueFloat(int Entity, const char[] sOutput); +native int GetOutputValueString(int Entity, const char[] sOutput, char[] sValue, int MaxLen); +native bool GetOutputValueVector(int Entity, const char[] sOutput, float afVec[3]); + native int FindOutput(int Entity, const char[] sOutput, int StartIndex, const char[] sTarget = NULL_STRING, // or NULL_STRING to ignore const char[] sTargetInput = NULL_STRING, // or NULL_STRING to ignore @@ -16,6 +24,7 @@ native int FindOutput(int Entity, const char[] sOutput, int StartIndex, float fDelay = -1.0, // or -1.0 to ignore int TimesToFire = 0 // or 0 to ignore ); + native int DeleteOutput(int Entity, const char[] sOutput, int Index); native int DeleteAllOutputs(int Entity, const char[] sOutput); @@ -51,4 +60,4 @@ public __ext_outputinfo_SetNTVOptional() MarkNativeAsOptional("DeleteOutput"); MarkNativeAsOptional("DeleteAllOutputs"); } -#endif \ No newline at end of file +#endif