Changed "Player" to "Client" in error messages about clients (attempt at some sort of error message consistency)
authorScott Ehlert <ds@alliedmods.net>
Wed Jun 20 11:30:29 2007 +0000 (2007-06-20)
changeset 994a0d587e40030
parent 993 05bbbe7ca77e
child 995 7dbca35a6414
Changed "Player" to "Client" in error messages about clients (attempt at some sort of error message consistency)

P.S. Happy 1000 Revisions, SourceMod!
core/smn_console.cpp
core/smn_halflife.cpp
core/smn_player.cpp
     1.1 --- a/core/smn_console.cpp	Wed Jun 20 11:12:50 2007 +0000
     1.2 +++ b/core/smn_console.cpp	Wed Jun 20 11:30:29 2007 +0000
     1.3 @@ -464,12 +464,12 @@
     1.4  
     1.5  	if (!pPlayer)
     1.6  	{
     1.7 -		return pContext->ThrowNativeError("Player %d is not a valid player", params[1]);
     1.8 +		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
     1.9  	}
    1.10  
    1.11  	if (!pPlayer->IsConnected())
    1.12  	{
    1.13 -		return pContext->ThrowNativeError("Player %d is not connected", params[1]);
    1.14 +		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
    1.15  	}
    1.16  
    1.17  	/* Trying a query on a bot results in callback not be fired, so don't bother */
    1.18 @@ -615,7 +615,7 @@
    1.19  	int index = params[1];
    1.20  	if ((index < 0) || (index > g_Players.GetMaxClients()))
    1.21  	{
    1.22 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    1.23 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    1.24  	}
    1.25  
    1.26  	CPlayer *pPlayer = NULL;
    1.27 @@ -695,12 +695,12 @@
    1.28  
    1.29  	if (!pPlayer)
    1.30  	{
    1.31 -		return pContext->ThrowNativeError("Player %d is not a valid player", params[1]);
    1.32 +		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
    1.33  	}
    1.34  
    1.35  	if (!pPlayer->IsConnected())
    1.36  	{
    1.37 -		return pContext->ThrowNativeError("Player %d is not connected", params[1]);
    1.38 +		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
    1.39  	}
    1.40  
    1.41  	char buffer[256];
    1.42 @@ -718,12 +718,12 @@
    1.43  
    1.44  	if (!pPlayer)
    1.45  	{
    1.46 -		return pContext->ThrowNativeError("Player %d is not a valid player", params[1]);
    1.47 +		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
    1.48  	}
    1.49  
    1.50  	if (!pPlayer->IsConnected())
    1.51  	{
    1.52 -		return pContext->ThrowNativeError("Player %d is not connected", params[1]);
    1.53 +		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
    1.54  	}
    1.55  
    1.56  	char buffer[256];
     2.1 --- a/core/smn_halflife.cpp	Wed Jun 20 11:12:50 2007 +0000
     2.2 +++ b/core/smn_halflife.cpp	Wed Jun 20 11:30:29 2007 +0000
     2.3 @@ -100,17 +100,17 @@
     2.4  
     2.5  	if (!pPlayer)
     2.6  	{
     2.7 -		return pContext->ThrowNativeError("Player %d is not a valid player", params[1]);
     2.8 +		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
     2.9  	}
    2.10  
    2.11  	if (!pPlayer->IsConnected())
    2.12  	{
    2.13 -		return pContext->ThrowNativeError("Player %d is not connected", params[1]);
    2.14 +		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
    2.15  	}
    2.16  
    2.17  	if (!pPlayer->IsFakeClient())
    2.18  	{
    2.19 -		return pContext->ThrowNativeError("Player %d is not a fake client", params[1]);
    2.20 +		return pContext->ThrowNativeError("Client %d is not a fake client", params[1]);
    2.21  	}
    2.22  
    2.23  	char *cvar, *value;
    2.24 @@ -239,7 +239,7 @@
    2.25  
    2.26  	if (!pPlayer)
    2.27  	{
    2.28 -		return pContext->ThrowNativeError("Client %d is not valid", params[1]);
    2.29 +		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
    2.30  	}
    2.31  
    2.32  	if (!pPlayer->IsInGame())
    2.33 @@ -265,7 +265,7 @@
    2.34  
    2.35  	if (!pPlayer)
    2.36  	{
    2.37 -		return pContext->ThrowNativeError("Client %d is not valid", client);
    2.38 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
    2.39  	}
    2.40  
    2.41  	if (!pPlayer->IsInGame())
    2.42 @@ -288,7 +288,7 @@
    2.43  
    2.44  	if (!pPlayer)
    2.45  	{
    2.46 -		return pContext->ThrowNativeError("Client %d is not valid", client);
    2.47 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
    2.48  	}
    2.49  
    2.50  	if (!pPlayer->IsInGame())
     3.1 --- a/core/smn_player.cpp	Wed Jun 20 11:12:50 2007 +0000
     3.2 +++ b/core/smn_player.cpp	Wed Jun 20 11:30:29 2007 +0000
     3.3 @@ -55,7 +55,7 @@
     3.4  	int index = params[1];
     3.5  	if ((index < 1) || (index > g_Players.GetMaxClients()))
     3.6  	{
     3.7 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
     3.8 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
     3.9  	}
    3.10  
    3.11  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
    3.12 @@ -73,7 +73,7 @@
    3.13  	int index = params[1];
    3.14  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.15  	{
    3.16 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.17 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.18  	}
    3.19  
    3.20  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
    3.21 @@ -99,7 +99,7 @@
    3.22  	int index = params[1];
    3.23  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.24  	{
    3.25 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.26 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.27  	}
    3.28  
    3.29  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
    3.30 @@ -123,7 +123,7 @@
    3.31  	int index = params[1];
    3.32  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.33  	{
    3.34 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.35 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.36  	}
    3.37  
    3.38  	return (g_Players.GetPlayerByIndex(index)->IsConnected()) ? 1 : 0;
    3.39 @@ -134,7 +134,7 @@
    3.40  	int index = params[1];
    3.41  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.42  	{
    3.43 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.44 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.45  	}
    3.46  
    3.47  	return (g_Players.GetPlayerByIndex(index)->IsInGame()) ? 1 : 0;
    3.48 @@ -145,7 +145,7 @@
    3.49  	int index = params[1];
    3.50  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.51  	{
    3.52 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.53 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.54  	}
    3.55  
    3.56  	return (g_Players.GetPlayerByIndex(index)->IsAuthorized()) ? 1 : 0;
    3.57 @@ -156,7 +156,7 @@
    3.58  	int index = params[1];
    3.59  	if ((index < 1) || (index > g_Players.GetMaxClients()))
    3.60  	{
    3.61 -		return pCtx->ThrowNativeError("Invalid client index %d", index);
    3.62 +		return pCtx->ThrowNativeError("Client index %d is invalid", index);
    3.63  	}
    3.64  
    3.65  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
    3.66 @@ -174,7 +174,7 @@
    3.67  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
    3.68  	if (!pPlayer)
    3.69  	{
    3.70 -		return pContext->ThrowNativeError("Invalid client index %d", client);
    3.71 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
    3.72  	}
    3.73  	if (!pPlayer->IsConnected())
    3.74  	{
    3.75 @@ -200,7 +200,7 @@
    3.76  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
    3.77  	if (!pPlayer)
    3.78  	{
    3.79 -		return pContext->ThrowNativeError("Invalid client index %d", client);
    3.80 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
    3.81  	}
    3.82  	if (!pPlayer->IsConnected())
    3.83  	{
    3.84 @@ -208,7 +208,7 @@
    3.85  	}
    3.86  	if (!g_Admins.IsValidAdmin(params[2]))
    3.87  	{
    3.88 -		return pContext->ThrowNativeError("AdminId %x is not valid", params[2]);
    3.89 +		return pContext->ThrowNativeError("AdminId %x is invalid", params[2]);
    3.90  	}
    3.91  
    3.92  	pPlayer->SetAdminId(params[2], params[3] ? true : false);
    3.93 @@ -222,7 +222,7 @@
    3.94  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
    3.95  	if (!pPlayer)
    3.96  	{
    3.97 -		return pContext->ThrowNativeError("Invalid client index %d", client);
    3.98 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
    3.99  	}
   3.100  	if (!pPlayer->IsConnected())
   3.101  	{
   3.102 @@ -238,7 +238,7 @@
   3.103  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.104  	if (!pPlayer)
   3.105  	{
   3.106 -		return pContext->ThrowNativeError("Invalid client index %d", client);
   3.107 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.108  	}
   3.109  	if (!pPlayer->IsConnected())
   3.110  	{
   3.111 @@ -268,7 +268,7 @@
   3.112  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.113  	if (!pPlayer)
   3.114  	{
   3.115 -		return pContext->ThrowNativeError("Invalid client index %d", client);
   3.116 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.117  	}
   3.118  	if (!pPlayer->IsConnected())
   3.119  	{
   3.120 @@ -297,7 +297,7 @@
   3.121  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.122  	if (!pPlayer)
   3.123  	{
   3.124 -		return pContext->ThrowNativeError("Invalid client index %d", client);
   3.125 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.126  	}
   3.127  	if (!pPlayer->IsConnected())
   3.128  	{
   3.129 @@ -322,7 +322,7 @@
   3.130  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.131  	if (!pPlayer)
   3.132  	{
   3.133 -		return pContext->ThrowNativeError("Invalid client index %d", client);
   3.134 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.135  	}
   3.136  	if (!pPlayer->IsConnected())
   3.137  	{
   3.138 @@ -344,7 +344,7 @@
   3.139  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.140  	if (!pPlayer)
   3.141  	{
   3.142 -		return pContext->ThrowNativeError("Invalid client index %d", client);
   3.143 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.144  	}
   3.145  	if (!pPlayer->IsConnected())
   3.146  	{
   3.147 @@ -362,17 +362,17 @@
   3.148  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.149  	if (!pPlayer)
   3.150  	{
   3.151 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.152 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.153  	} else if (!pPlayer->IsConnected()) {
   3.154 -		return pContext->ThrowNativeError("Player %d is not connected", client);
   3.155 +		return pContext->ThrowNativeError("Client %d is not connected", client);
   3.156  	}
   3.157  
   3.158  	CPlayer *pTarget = g_Players.GetPlayerByIndex(target);
   3.159  	if (!pTarget)
   3.160  	{
   3.161 -		return pContext->ThrowNativeError("Player %d is not a valid client", target);
   3.162 +		return pContext->ThrowNativeError("Client index %d is invalid", target);
   3.163  	} else if (!pTarget->IsConnected()) {
   3.164 -		return pContext->ThrowNativeError("Player %d is not connected", target);
   3.165 +		return pContext->ThrowNativeError("Client %d is not connected", target);
   3.166  	}
   3.167  
   3.168  	return g_Admins.CanAdminTarget(pPlayer->GetAdminId(), pTarget->GetAdminId()) ? 1 : 0;
   3.169 @@ -385,9 +385,9 @@
   3.170  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.171  	if (!pPlayer)
   3.172  	{
   3.173 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.174 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.175  	} else if (!pPlayer->IsInGame()) {
   3.176 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.177 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.178  	}
   3.179  
   3.180  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.181 @@ -406,9 +406,9 @@
   3.182  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.183  	if (!pPlayer)
   3.184  	{
   3.185 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.186 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.187  	} else if (!pPlayer->IsInGame()) {
   3.188 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.189 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.190  	}
   3.191  
   3.192  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.193 @@ -427,9 +427,9 @@
   3.194  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.195  	if (!pPlayer)
   3.196  	{
   3.197 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.198 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.199  	} else if (!pPlayer->IsInGame()) {
   3.200 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.201 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.202  	}
   3.203  
   3.204  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.205 @@ -448,9 +448,9 @@
   3.206  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.207  	if (!pPlayer)
   3.208  	{
   3.209 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.210 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.211  	} else if (!pPlayer->IsInGame()) {
   3.212 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.213 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.214  	}
   3.215  
   3.216  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.217 @@ -469,9 +469,9 @@
   3.218  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.219  	if (!pPlayer)
   3.220  	{
   3.221 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.222 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.223  	} else if (!pPlayer->IsInGame()) {
   3.224 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.225 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.226  	}
   3.227  
   3.228  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.229 @@ -498,9 +498,9 @@
   3.230  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.231  	if (!pPlayer)
   3.232  	{
   3.233 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.234 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.235  	} else if (!pPlayer->IsInGame()) {
   3.236 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.237 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.238  	}
   3.239  
   3.240  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.241 @@ -527,9 +527,9 @@
   3.242  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.243  	if (!pPlayer)
   3.244  	{
   3.245 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.246 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.247  	} else if (!pPlayer->IsInGame()) {
   3.248 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.249 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.250  	}
   3.251  
   3.252  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.253 @@ -556,9 +556,9 @@
   3.254  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.255  	if (!pPlayer)
   3.256  	{
   3.257 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.258 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.259  	} else if (!pPlayer->IsInGame()) {
   3.260 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.261 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.262  	}
   3.263  
   3.264  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.265 @@ -585,9 +585,9 @@
   3.266  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.267  	if (!pPlayer)
   3.268  	{
   3.269 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.270 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.271  	} else if (!pPlayer->IsInGame()) {
   3.272 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.273 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.274  	}
   3.275  
   3.276  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.277 @@ -609,9 +609,9 @@
   3.278  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.279  	if (!pPlayer)
   3.280  	{
   3.281 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.282 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.283  	} else if (!pPlayer->IsInGame()) {
   3.284 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.285 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.286  	}
   3.287  
   3.288  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.289 @@ -633,9 +633,9 @@
   3.290  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.291  	if (!pPlayer)
   3.292  	{
   3.293 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.294 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.295  	} else if (!pPlayer->IsInGame()) {
   3.296 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.297 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.298  	}
   3.299  
   3.300  	IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
   3.301 @@ -654,11 +654,11 @@
   3.302  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.303  	if (!pPlayer)
   3.304  	{
   3.305 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.306 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.307  	} else if (!pPlayer->IsInGame()) {
   3.308 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.309 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.310  	} else if (pPlayer->IsFakeClient()) {
   3.311 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.312 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.313  	}
   3.314  
   3.315  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.316 @@ -673,11 +673,11 @@
   3.317  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.318  	if (!pPlayer)
   3.319  	{
   3.320 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.321 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.322  	} else if (!pPlayer->IsInGame()) {
   3.323 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.324 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.325  	} else if (pPlayer->IsFakeClient()) {
   3.326 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.327 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.328  	}
   3.329  
   3.330  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.331 @@ -692,11 +692,11 @@
   3.332  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.333  	if (!pPlayer)
   3.334  	{
   3.335 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.336 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.337  	} else if (!pPlayer->IsInGame()) {
   3.338 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.339 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.340  	} else if (pPlayer->IsFakeClient()) {
   3.341 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.342 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.343  	}
   3.344  
   3.345  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.346 @@ -711,11 +711,11 @@
   3.347  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.348  	if (!pPlayer)
   3.349  	{
   3.350 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.351 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.352  	} else if (!pPlayer->IsInGame()) {
   3.353 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.354 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.355  	} else if (pPlayer->IsFakeClient()) {
   3.356 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.357 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.358  	}
   3.359  
   3.360  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.361 @@ -730,11 +730,11 @@
   3.362  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.363  	if (!pPlayer)
   3.364  	{
   3.365 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.366 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.367  	} else if (!pPlayer->IsInGame()) {
   3.368 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.369 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.370  	} else if (pPlayer->IsFakeClient()) {
   3.371 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.372 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.373  	}
   3.374  
   3.375  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.376 @@ -749,11 +749,11 @@
   3.377  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.378  	if (!pPlayer)
   3.379  	{
   3.380 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.381 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.382  	} else if (!pPlayer->IsInGame()) {
   3.383 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.384 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.385  	} else if (pPlayer->IsFakeClient()) {
   3.386 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.387 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.388  	}
   3.389  
   3.390  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.391 @@ -768,11 +768,11 @@
   3.392  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.393  	if (!pPlayer)
   3.394  	{
   3.395 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.396 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.397  	} else if (!pPlayer->IsInGame()) {
   3.398 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.399 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.400  	} else if (pPlayer->IsFakeClient()) {
   3.401 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.402 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.403  	}
   3.404  
   3.405  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.406 @@ -787,11 +787,11 @@
   3.407  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.408  	if (!pPlayer)
   3.409  	{
   3.410 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.411 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.412  	} else if (!pPlayer->IsInGame()) {
   3.413 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.414 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.415  	} else if (pPlayer->IsFakeClient()) {
   3.416 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.417 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.418  	}
   3.419  
   3.420  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.421 @@ -806,11 +806,11 @@
   3.422  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.423  	if (!pPlayer)
   3.424  	{
   3.425 -		return pContext->ThrowNativeError("Player %d is not a valid client", client);
   3.426 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.427  	} else if (!pPlayer->IsInGame()) {
   3.428 -		return pContext->ThrowNativeError("Player %d is not in game", client);
   3.429 +		return pContext->ThrowNativeError("Client %d is not in game", client);
   3.430  	} else if (pPlayer->IsFakeClient()) {
   3.431 -		return pContext->ThrowNativeError("Player %d is a bot", client);
   3.432 +		return pContext->ThrowNativeError("Client %d is a bot", client);
   3.433  	}
   3.434  
   3.435  	INetChannelInfo *pInfo = engine->GetPlayerNetInfo(client);
   3.436 @@ -926,7 +926,7 @@
   3.437  	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
   3.438  	if (!pPlayer)
   3.439  	{
   3.440 -		return pContext->ThrowNativeError("Client %d is invalid", client);
   3.441 +		return pContext->ThrowNativeError("Client index %d is invalid", client);
   3.442  	} else if (!pPlayer->IsConnected()) {
   3.443  		return pContext->ThrowNativeError("Client %d is not connected", client);
   3.444  	}