From 7befa37ee5c5c7faf60116f0bf1b98011b756db9 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 14 Oct 2007 02:16:33 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1356 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/enet/configure | 20 ++++++++++---------- source/enet/protocol.c | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/source/enet/configure b/source/enet/configure index df9bf91b..908b6ad3 100755 --- a/source/enet/configure +++ b/source/enet/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libenet 10-11-2007. +# Generated by GNU Autoconf 2.61 for libenet 10-12-2007. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libenet' PACKAGE_TARNAME='libenet' -PACKAGE_VERSION='10-11-2007' -PACKAGE_STRING='libenet 10-11-2007' +PACKAGE_VERSION='10-12-2007' +PACKAGE_STRING='libenet 10-12-2007' PACKAGE_BUGREPORT='' ac_subst_vars='SHELL @@ -1168,7 +1168,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libenet 10-11-2007 to adapt to many kinds of systems. +\`configure' configures libenet 10-12-2007 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1234,7 +1234,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libenet 10-11-2007:";; + short | recursive ) echo "Configuration of libenet 10-12-2007:";; esac cat <<\_ACEOF @@ -1318,7 +1318,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libenet configure 10-11-2007 +libenet configure 10-12-2007 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1332,7 +1332,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libenet $as_me 10-11-2007, which was +It was created by libenet $as_me 10-12-2007, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2002,7 +2002,7 @@ fi # Define the identity of the package. PACKAGE=libenet.a - VERSION=10-11-2007 + VERSION=10-12-2007 cat >>confdefs.h <<_ACEOF @@ -4929,7 +4929,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libenet $as_me 10-11-2007, which was +This file was extended by libenet $as_me 10-12-2007, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4976,7 +4976,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libenet config.status 10-11-2007 +libenet config.status 10-12-2007 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/source/enet/protocol.c b/source/enet/protocol.c index 5fccb4c3..d8281f06 100755 --- a/source/enet/protocol.c +++ b/source/enet/protocol.c @@ -176,7 +176,23 @@ enet_protocol_remove_sent_reliable_command (ENetPeer * peer, enet_uint16 reliabl } if (currentCommand == enet_list_end (& peer -> sentReliableCommands)) - return ENET_PROTOCOL_COMMAND_NONE; + { + for (currentCommand = enet_list_begin (& peer -> outgoingReliableCommands); + currentCommand != enet_list_end (& peer -> outgoingReliableCommands); + currentCommand = enet_list_next (currentCommand)) + { + outgoingCommand = (ENetOutgoingCommand *) currentCommand; + + if (outgoingCommand -> sendAttempts < 1) return ENET_PROTOCOL_COMMAND_NONE; + + if (outgoingCommand -> reliableSequenceNumber == reliableSequenceNumber && + outgoingCommand -> command.header.channelID == channelID) + break; + } + + if (currentCommand == enet_list_end (& peer -> outgoingReliableCommands)) + return ENET_PROTOCOL_COMMAND_NONE; + } if (channelID < peer -> channelCount) {