diff --git a/core/CConVarManager.cpp b/core/CConVarManager.cpp index e5627007..8320888e 100644 --- a/core/CConVarManager.cpp +++ b/core/CConVarManager.cpp @@ -259,7 +259,7 @@ void CConVarManager::HookConVarChange(IPluginContext *pContext, ConVar *cvar, fu // This shouldn't happen... if (func == NULL) { - pContext->ThrowNativeError("Invalid function: %d", funcid); + pContext->ThrowNativeError("Invalid function specified"); return; } @@ -302,7 +302,7 @@ void CConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *cvar, // This shouldn't happen... if (func == NULL) { - pContext->ThrowNativeError("Invalid function: %d", funcid); + pContext->ThrowNativeError("Invalid function specified"); return; } @@ -315,14 +315,14 @@ void CConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *cvar, // If the forward doesn't exist, we can't unhook anything if (fwd == NULL) { - pContext->ThrowNativeError("Convar \"%s\" has no active hook.", cvar->GetName()); + pContext->ThrowNativeError("Convar \"%s\" has no active hook", cvar->GetName()); return; } // Remove the function from the forward's list if (!fwd->RemoveFunction(func)) { - pContext->ThrowNativeError("Function %d is not a valid hook callback for convar \"%s\"", funcid, cvar->GetName()); + pContext->ThrowNativeError("Invalid hook callback specified for convar \"%s\"", cvar->GetName()); return; } @@ -362,4 +362,3 @@ void CConVarManager::OnConVarChanged(ConVar *cvar, const char *oldValue) fwd->PushString(oldValue); fwd->Execute(NULL); } - diff --git a/core/CDbgReporter.cpp b/core/CDbgReporter.cpp index f2f46ad8..601de0e5 100644 --- a/core/CDbgReporter.cpp +++ b/core/CDbgReporter.cpp @@ -41,7 +41,7 @@ void CDbgReporter::OnContextExecuteError(IPluginContext *ctx, IContextTrace *err const char *custerr; if ((custerr=error->GetCustomErrorString()) != NULL) { - g_Logger.LogError("[SM] Native \"%s\" reported: \"%s\"", lastname, custerr); + g_Logger.LogError("[SM] Native \"%s\" reported: %s", lastname, custerr); } else { g_Logger.LogError("[SM] Native \"%s\" encountered a generic error.", lastname); } diff --git a/core/smn_convar.cpp b/core/smn_convar.cpp index ef7acf11..9efccae6 100644 --- a/core/smn_convar.cpp +++ b/core/smn_convar.cpp @@ -25,7 +25,7 @@ static cell_t sm_CreateConVar(IPluginContext *pContext, const cell_t *params) // While the engine seems to accept a blank convar name, it causes a crash upon server quit if (name == NULL || strcmp(name, "") == 0) { - return pContext->ThrowNativeError("Null or blank convar name is not allowed."); + return pContext->ThrowNativeError("Null or blank convar name is not allowed"); } pContext->LocalToString(params[2], &defaultVal);