From ac3896feaf31a6155f648c401b1b84c5c8a6aadf Mon Sep 17 00:00:00 2001 From: belugas Date: Mon, 30 Jun 2008 16:59:35 +0000 Subject: [PATCH] (svn r13665) -Fix[FS#2119]: Wrong PlayerID used for sending a message to.Patch by Yexo --- src/console_cmds.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 4589dd579a..38d765ef43 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -1184,15 +1184,16 @@ DEF_CONSOLE_CMD(ConSayPlayer) if (argc != 3) return false; - if (atoi(argv[1]) < 1 || atoi(argv[1]) > MAX_PLAYERS) { + PlayerID player_id = (PlayerID)(atoi(argv[1]) - 1); + if (!IsValidPlayer(player_id) || !GetPlayer(player_id)->is_active) { IConsolePrintF(CC_DEFAULT, "Unknown player. Player range is between 1 and %d.", MAX_PLAYERS); return true; } if (!_network_server) { - NetworkClientSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, atoi(argv[1]), argv[2]); + NetworkClientSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, player_id, argv[2]); } else { - NetworkServerSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, atoi(argv[1]), argv[2], NETWORK_SERVER_INDEX); + NetworkServerSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, player_id, argv[2], NETWORK_SERVER_INDEX); } return true;