# HG changeset patch # User Scott Ehlert # Date 1182339029 0 # Node ID a0d587e400301d99374fdcb28b221fd3296681df # Parent 05bbbe7ca77ea34d400456a8e24f474c80a0f8a8 Changed "Player" to "Client" in error messages about clients (attempt at some sort of error message consistency) P.S. Happy 1000 Revisions, SourceMod! diff -r 05bbbe7ca77e -r a0d587e40030 core/smn_console.cpp --- a/core/smn_console.cpp Wed Jun 20 11:12:50 2007 +0000 +++ b/core/smn_console.cpp Wed Jun 20 11:30:29 2007 +0000 @@ -464,12 +464,12 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid player", params[1]); + return pContext->ThrowNativeError("Client index %d is invalid", params[1]); } if (!pPlayer->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", params[1]); + return pContext->ThrowNativeError("Client %d is not connected", params[1]); } /* Trying a query on a bot results in callback not be fired, so don't bother */ @@ -615,7 +615,7 @@ int index = params[1]; if ((index < 0) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } CPlayer *pPlayer = NULL; @@ -695,12 +695,12 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid player", params[1]); + return pContext->ThrowNativeError("Client index %d is invalid", params[1]); } if (!pPlayer->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", params[1]); + return pContext->ThrowNativeError("Client %d is not connected", params[1]); } char buffer[256]; @@ -718,12 +718,12 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid player", params[1]); + return pContext->ThrowNativeError("Client index %d is invalid", params[1]); } if (!pPlayer->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", params[1]); + return pContext->ThrowNativeError("Client %d is not connected", params[1]); } char buffer[256]; diff -r 05bbbe7ca77e -r a0d587e40030 core/smn_halflife.cpp --- a/core/smn_halflife.cpp Wed Jun 20 11:12:50 2007 +0000 +++ b/core/smn_halflife.cpp Wed Jun 20 11:30:29 2007 +0000 @@ -100,17 +100,17 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid player", params[1]); + return pContext->ThrowNativeError("Client index %d is invalid", params[1]); } if (!pPlayer->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", params[1]); + return pContext->ThrowNativeError("Client %d is not connected", params[1]); } if (!pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is not a fake client", params[1]); + return pContext->ThrowNativeError("Client %d is not a fake client", params[1]); } char *cvar, *value; @@ -239,7 +239,7 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Client %d is not valid", params[1]); + return pContext->ThrowNativeError("Client index %d is invalid", params[1]); } if (!pPlayer->IsInGame()) @@ -265,7 +265,7 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Client %d is not valid", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsInGame()) @@ -288,7 +288,7 @@ if (!pPlayer) { - return pContext->ThrowNativeError("Client %d is not valid", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsInGame()) diff -r 05bbbe7ca77e -r a0d587e40030 core/smn_player.cpp --- a/core/smn_player.cpp Wed Jun 20 11:12:50 2007 +0000 +++ b/core/smn_player.cpp Wed Jun 20 11:30:29 2007 +0000 @@ -55,7 +55,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } CPlayer *pPlayer = g_Players.GetPlayerByIndex(index); @@ -73,7 +73,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } CPlayer *pPlayer = g_Players.GetPlayerByIndex(index); @@ -99,7 +99,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } CPlayer *pPlayer = g_Players.GetPlayerByIndex(index); @@ -123,7 +123,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } return (g_Players.GetPlayerByIndex(index)->IsConnected()) ? 1 : 0; @@ -134,7 +134,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } return (g_Players.GetPlayerByIndex(index)->IsInGame()) ? 1 : 0; @@ -145,7 +145,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } return (g_Players.GetPlayerByIndex(index)->IsAuthorized()) ? 1 : 0; @@ -156,7 +156,7 @@ int index = params[1]; if ((index < 1) || (index > g_Players.GetMaxClients())) { - return pCtx->ThrowNativeError("Invalid client index %d", index); + return pCtx->ThrowNativeError("Client index %d is invalid", index); } CPlayer *pPlayer = g_Players.GetPlayerByIndex(index); @@ -174,7 +174,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -200,7 +200,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -208,7 +208,7 @@ } if (!g_Admins.IsValidAdmin(params[2])) { - return pContext->ThrowNativeError("AdminId %x is not valid", params[2]); + return pContext->ThrowNativeError("AdminId %x is invalid", params[2]); } pPlayer->SetAdminId(params[2], params[3] ? true : false); @@ -222,7 +222,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -238,7 +238,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -268,7 +268,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -297,7 +297,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -322,7 +322,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -344,7 +344,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Invalid client index %d", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } if (!pPlayer->IsConnected()) { @@ -362,17 +362,17 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", client); + return pContext->ThrowNativeError("Client %d is not connected", client); } CPlayer *pTarget = g_Players.GetPlayerByIndex(target); if (!pTarget) { - return pContext->ThrowNativeError("Player %d is not a valid client", target); + return pContext->ThrowNativeError("Client index %d is invalid", target); } else if (!pTarget->IsConnected()) { - return pContext->ThrowNativeError("Player %d is not connected", target); + return pContext->ThrowNativeError("Client %d is not connected", target); } return g_Admins.CanAdminTarget(pPlayer->GetAdminId(), pTarget->GetAdminId()) ? 1 : 0; @@ -385,9 +385,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -406,9 +406,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -427,9 +427,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -448,9 +448,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -469,9 +469,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -498,9 +498,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -527,9 +527,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -556,9 +556,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -585,9 +585,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -609,9 +609,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -633,9 +633,9 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } IPlayerInfo *pInfo = pPlayer->GetPlayerInfo(); @@ -654,11 +654,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -673,11 +673,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -692,11 +692,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -711,11 +711,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -730,11 +730,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -749,11 +749,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -768,11 +768,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -787,11 +787,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -806,11 +806,11 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Player %d is not a valid client", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsInGame()) { - return pContext->ThrowNativeError("Player %d is not in game", client); + return pContext->ThrowNativeError("Client %d is not in game", client); } else if (pPlayer->IsFakeClient()) { - return pContext->ThrowNativeError("Player %d is a bot", client); + return pContext->ThrowNativeError("Client %d is a bot", client); } INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client); @@ -926,7 +926,7 @@ CPlayer *pPlayer = g_Players.GetPlayerByIndex(client); if (!pPlayer) { - return pContext->ThrowNativeError("Client %d is invalid", client); + return pContext->ThrowNativeError("Client index %d is invalid", client); } else if (!pPlayer->IsConnected()) { return pContext->ThrowNativeError("Client %d is not connected", client); }