From e64210dee7a99ee740e671b7a38480c711e0725b Mon Sep 17 00:00:00 2001 From: asmodai Date: Tue, 3 May 2016 03:35:19 +0300 Subject: [PATCH] Unified style of the error messages Fixed typo in reapi version define --- .../extra/amxmodx/scripting/include/reapi.inc | 4 ++-- reapi/src/natives/natives_addons.cpp | 9 +++++++ reapi/src/natives/natives_helper.h | 4 ++-- reapi/src/natives/natives_hookchains.cpp | 24 +++++++++---------- reapi/src/natives/natives_members.cpp | 16 ++++++------- reapi/src/natives/natives_misc.cpp | 24 +++++++++---------- 6 files changed, 45 insertions(+), 36 deletions(-) diff --git a/reapi/extra/amxmodx/scripting/include/reapi.inc b/reapi/extra/amxmodx/scripting/include/reapi.inc index 70d895e..7389491 100644 --- a/reapi/extra/amxmodx/scripting/include/reapi.inc +++ b/reapi/extra/amxmodx/scripting/include/reapi.inc @@ -14,8 +14,8 @@ #endif // reapi version -#define REAPI_VERISON_MAJOR 1 -#define REAPI_VERISON_MINOR 0 +#define REAPI_VERSION_MAJOR 1 +#define REAPI_VERSION_MINOR 0 #define NULLENT -1 diff --git a/reapi/src/natives/natives_addons.cpp b/reapi/src/natives/natives_addons.cpp index 5c050aa..e12d6a8 100644 --- a/reapi/src/natives/natives_addons.cpp +++ b/reapi/src/natives/natives_addons.cpp @@ -11,6 +11,9 @@ cell AMX_NATIVE_CALL VTC_IsClientSpeaking(AMX *amx, cell *params) { enum args_e { arg_count, arg_index }; + + CHECK_ISPLAYER(arg_index); + return g_pVoiceTranscoderApi->IsClientSpeaking((size_t)params[arg_index]); } @@ -25,6 +28,9 @@ cell AMX_NATIVE_CALL VTC_IsClientSpeaking(AMX *amx, cell *params) cell AMX_NATIVE_CALL VTC_MuteClient(AMX *amx, cell *params) { enum args_e { arg_count, arg_index }; + + CHECK_ISPLAYER(arg_index); + g_pVoiceTranscoderApi->MuteClient((size_t)params[arg_index]); return FALSE; @@ -41,6 +47,9 @@ cell AMX_NATIVE_CALL VTC_MuteClient(AMX *amx, cell *params) cell AMX_NATIVE_CALL VTC_UnmuteClient(AMX *amx, cell *params) { enum args_e { arg_count, arg_index }; + + CHECK_ISPLAYER(arg_index); + g_pVoiceTranscoderApi->UnmuteClient((size_t)params[arg_index]); return FALSE; diff --git a/reapi/src/natives/natives_helper.h b/reapi/src/natives/natives_helper.h index 6a64097..ee406de 100644 --- a/reapi/src/natives/natives_helper.h +++ b/reapi/src/natives/natives_helper.h @@ -1,7 +1,7 @@ #pragma once -#define CHECK_ISPLAYER(x) if (params[x] <= 0 || params[x] > gpGlobals->maxClients) { MF_LogError(amx, AMX_ERR_NATIVE, "invalid player index %i [%s]", params[x], #x); return FALSE; } -#define CHECK_ISENTITY(x) if (params[x] > gpGlobals->maxEntities) { MF_LogError(amx, AMX_ERR_NATIVE, "invalid entity index %i [%s]", params[x], #x); return FALSE; } +#define CHECK_ISPLAYER(x) if (params[x] <= 0 || params[x] > gpGlobals->maxClients) { MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid player index %i [%s]", __FUNCTION__, params[x], #x); return FALSE; } +#define CHECK_ISENTITY(x) if (params[x] > gpGlobals->maxEntities) { MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid entity index %i [%s]", __FUNCTION__, params[x], #x); return FALSE; } class CAmxArg { diff --git a/reapi/src/natives/natives_hookchains.cpp b/reapi/src/natives/natives_hookchains.cpp index a6712d0..6cf124b 100644 --- a/reapi/src/natives/natives_hookchains.cpp +++ b/reapi/src/natives/natives_hookchains.cpp @@ -22,13 +22,13 @@ cell AMX_NATIVE_CALL RegisterHookChain(AMX *amx, cell *params) if (hook == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "RegisterHookChain: function with id (%d) doesn't exist in current API version.", func); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: function with id (%d) doesn't exist in current API version.", __FUNCTION__, func); return 0; } if (!hook->checkRequirements()) { - MF_LogError(amx, AMX_ERR_NATIVE, "RegisterHookChain: function (%s) is not available, %s required", hook->func_name, hook->depend_name); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: function (%s) is not available, %s required", __FUNCTION__, hook->func_name, hook->depend_name); return 0; } @@ -36,14 +36,14 @@ cell AMX_NATIVE_CALL RegisterHookChain(AMX *amx, cell *params) const char *funcname = getAmxString(amx, params[arg_handler]); if (g_amxxapi.amx_FindPublic(amx, funcname, &funcid) != AMX_ERR_NONE) { - MF_LogError(amx, AMX_ERR_NATIVE, "RegisterHookChain: public function \"%s\" not found.", funcname); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: public function \"%s\" not found.", __FUNCTION__, funcname); return 0; } int fwid = hook->registerForward(amx, funcname); if (fwid == -1) { - MF_LogError(amx, AMX_ERR_NATIVE, "RegisterHookChain: register forward failed."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: register forward failed.", __FUNCTION__); return 0; } @@ -68,7 +68,7 @@ cell AMX_NATIVE_CALL EnableHookChain(AMX *amx, cell *params) if (hook == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "EnableHookChain: invalid HookChain handle."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid HookChain handle.", __FUNCTION__); return FALSE; } @@ -93,7 +93,7 @@ cell AMX_NATIVE_CALL DisableHookChain(AMX *amx, cell *params) if (hook == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "DisableHookChain: invalid HookChain handle."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid HookChain handle.", __FUNCTION__); return FALSE; } @@ -115,7 +115,7 @@ cell AMX_NATIVE_CALL SetHookChainReturn(AMX *amx, cell *params) { if (!g_hookCtx) { - MF_LogError(amx, AMX_ERR_NATIVE, "Trying to set return value without active hook."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: trying to set return value without active hook.", __FUNCTION__); return FALSE; } @@ -124,7 +124,7 @@ cell AMX_NATIVE_CALL SetHookChainReturn(AMX *amx, cell *params) if (params[arg_type] != retVal.type) { - MF_LogError(amx, AMX_ERR_NATIVE, "Trying to set incompatible return type."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: trying to set return value with incompatible type.", __FUNCTION__); return FALSE; } @@ -173,7 +173,7 @@ cell AMX_NATIVE_CALL GetHookChainReturn(AMX *amx, cell *params) { if (!g_hookCtx) { - MF_LogError(amx, AMX_ERR_NATIVE, "Trying to get return value without active hook."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: trying to get return value without active hook.", __FUNCTION__); return FALSE; } @@ -222,7 +222,7 @@ cell AMX_NATIVE_CALL SetHookChainArg(AMX *amx, cell *params) { if (!g_hookCtx) { - MF_LogError(amx, AMX_ERR_NATIVE, "Trying to get return value without active hook."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: trying to get return value without active hook.", __FUNCTION__); return FALSE; } @@ -231,7 +231,7 @@ cell AMX_NATIVE_CALL SetHookChainArg(AMX *amx, cell *params) if (number >= g_hookCtx->args_count) { - MF_LogError(amx, AMX_ERR_NATIVE, "SetHookChainArg: can't set argument %i of hookchain with %i args.", params[arg_number], g_hookCtx->args_count); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: can't set argument %i of hookchain with %i args.", __FUNCTION__, params[arg_number], g_hookCtx->args_count); return FALSE; } @@ -239,7 +239,7 @@ cell AMX_NATIVE_CALL SetHookChainArg(AMX *amx, cell *params) if (params[arg_type] != type) { - MF_LogError(amx, AMX_ERR_NATIVE, "SetHookChainArg: invalid argument type provided."); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid argument type provided.", __FUNCTION__); return FALSE; } diff --git a/reapi/src/natives/natives_members.cpp b/reapi/src/natives/natives_members.cpp index adee8fb..9d9b268 100644 --- a/reapi/src/natives/natives_members.cpp +++ b/reapi/src/natives/natives_members.cpp @@ -7,13 +7,13 @@ cell AMX_NATIVE_CALL set_member(AMX *amx, cell *params) member_t *member = memberlist[params[arg_member]]; if (member == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "set_member: unknown member id %i", params[arg_member]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown member id %i", __FUNCTION__, params[arg_member]); return FALSE; } edict_t *pEdict = INDEXENT(params[arg_index]); if (pEdict == nullptr || pEdict->pvPrivateData == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "set_member: invalid or uninitialized entity"); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid or uninitialized entity", __FUNCTION__); return FALSE; } @@ -30,13 +30,13 @@ cell AMX_NATIVE_CALL get_member(AMX *amx, cell *params) member_t *member = memberlist[params[arg_member]]; if (member == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "get_member: unknown member id %i", params[arg_member]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown member id %i", __FUNCTION__, params[arg_member]); return FALSE; } edict_t *pEdict = INDEXENT(params[arg_index]); if (pEdict == nullptr || pEdict->pvPrivateData == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "get_member: invalid or uninitialized entity"); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid or uninitialized entity", __FUNCTION__); return FALSE; } @@ -74,12 +74,12 @@ cell AMX_NATIVE_CALL set_member_game(AMX *amx, cell *params) member_t *member = memberlist[params[arg_member]]; if (member == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "set_member_game: unknown member id %i", params[arg_member]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown member id %i", __FUNCTION__, params[arg_member]); return FALSE; } if (g_pGameRules == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "get_member_game: gamerules not initialized"); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: gamerules not initialized", __FUNCTION__); return FALSE; } @@ -96,12 +96,12 @@ cell AMX_NATIVE_CALL get_member_game(AMX *amx, cell *params) member_t *member = memberlist[params[arg_member]]; if (member == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "get_member_game: unknown member id %i", params[arg_member]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown member id %i", __FUNCTION__, params[arg_member]); return FALSE; } if (g_pGameRules == nullptr) { - MF_LogError(amx, AMX_ERR_NATIVE, "get_member_game: gamerules not initialized"); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: gamerules not initialized", __FUNCTION__); return FALSE; } diff --git a/reapi/src/natives/natives_misc.cpp b/reapi/src/natives/natives_misc.cpp index 7075013..ffa56c2 100644 --- a/reapi/src/natives/natives_misc.cpp +++ b/reapi/src/natives/natives_misc.cpp @@ -18,7 +18,7 @@ cell AMX_NATIVE_CALL rg_set_animation(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -45,7 +45,7 @@ cell AMX_NATIVE_CALL rg_add_account(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -71,7 +71,7 @@ cell AMX_NATIVE_CALL rg_give_item(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -97,7 +97,7 @@ cell AMX_NATIVE_CALL rg_give_default_items(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -123,7 +123,7 @@ cell AMX_NATIVE_CALL rg_give_shield(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -215,7 +215,7 @@ cell AMX_NATIVE_CALL rg_multidmg_add(AMX *amx, cell *params) CHECK_ISENTITY(arg_victim); if (params[arg_victim] < 0) { // null - MF_LogError(amx, AMX_ERR_NATIVE, "rg_multidmg_add: victim == null"); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: victim == null", __FUNCTION__); return FALSE; } @@ -361,7 +361,7 @@ cell AMX_NATIVE_CALL rg_round_end(AMX *amx, cell *params) size_t winstatus = params[arg_win]; if (winstatus <= 0) { - MF_LogError(amx, AMX_ERR_NATIVE, "rg_round_end: unknown win-status %i", winstatus); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown win status %i", __FUNCTION__, winstatus); return FALSE; } @@ -509,7 +509,7 @@ cell AMX_NATIVE_CALL rg_get_weapon_info(AMX *amx, cell *params) int weapon_id = params[arg_weapon_id]; if (weapon_id <= WEAPON_NONE || weapon_id == WEAPON_C4 || weapon_id == WEAPON_KNIFE || weapon_id > WEAPON_P90) { - MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %i", weapon_id); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: invalid weapon id %i", __FUNCTION__, weapon_id); return 0; } @@ -533,7 +533,7 @@ cell AMX_NATIVE_CALL rg_get_weapon_info(AMX *amx, cell *params) case WPINFO_NAME: { if (PARAMS_COUNT != arg_4) { - MF_LogError(amx, AMX_ERR_NATIVE, "rg_get_weapon_info: bad parameter count, got %i, expected %i", PARAMS_COUNT, arg_4); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: bad parameter count, got %i, expected %i", __FUNCTION__, PARAMS_COUNT, arg_4); return -1; } @@ -545,7 +545,7 @@ cell AMX_NATIVE_CALL rg_get_weapon_info(AMX *amx, cell *params) } default: { - MF_LogError(amx, AMX_ERR_NATIVE, "rg_get_weapon_info: unknown type statement %i, params count %i", info_type, PARAMS_COUNT); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: unknown type statement %i, params count %i", __FUNCTION__, info_type, PARAMS_COUNT); return -1; } } @@ -568,7 +568,7 @@ cell AMX_NATIVE_CALL rg_remove_all_items(AMX *amx, cell *params) ICSPlayer *pPlayer = g_ReGameFuncs->INDEX_TO_CSPLAYER(params[arg_index]); if (pPlayer == nullptr || !pPlayer->IsConnected()) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; } @@ -594,7 +594,7 @@ cell AMX_NATIVE_CALL rg_remove_item(AMX *amx, cell *params) CBasePlayer *pPlayer = (CBasePlayer *)g_ReGameFuncs->UTIL_PlayerByIndex(params[arg_index]); if (pPlayer == nullptr || pPlayer->has_disconnected) { - MF_LogError(amx, AMX_ERR_NATIVE, "player %i is not connected", params[arg_index]); + MF_LogError(amx, AMX_ERR_NATIVE, "%s: player %i is not connected", __FUNCTION__, params[arg_index]); return FALSE; }