aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-11 18:34:15 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-11 18:34:15 +0000
commit7e5a2d48ecff826b5c7961f528e3f41b41f4f95e (patch)
tree6ea22a78b7d01eef1f7cb2d78b1b1b62cd0231d4
parent2c0063219160e34886e6cec762fa2ab1eee2d16c (diff)
downloadioquake3-aero-7e5a2d48ecff826b5c7961f528e3f41b41f4f95e.tar.gz
ioquake3-aero-7e5a2d48ecff826b5c7961f528e3f41b41f4f95e.zip
Whoops.. don't make it overwrite cmds in case of recursive error.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1656 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/cl_main.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 67c8017..c3cefbf 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -467,14 +467,13 @@ void CL_AddReliableCommand(const char *cmd, qboolean isDisconnectCmd)
// we must drop the connection
// also leave one slot open for the disconnect command in this case.
- if (!com_errorEntered &&
- (
- (isDisconnectCmd && unacknowledged > MAX_RELIABLE_COMMANDS) ||
- (!isDisconnectCmd && unacknowledged >= MAX_RELIABLE_COMMANDS)
- )
- )
+ if ((isDisconnectCmd && unacknowledged > MAX_RELIABLE_COMMANDS) ||
+ (!isDisconnectCmd && unacknowledged >= MAX_RELIABLE_COMMANDS))
{
- Com_Error(ERR_DROP, "Client command overflow");
+ if(com_errorEntered)
+ return;
+ else
+ Com_Error(ERR_DROP, "Client command overflow");
}
Q_strncpyz(clc.reliableCommands[++clc.reliableSequence & (MAX_RELIABLE_COMMANDS - 1)],