[enet-cvs] CVS: enet peer.c,1.18,1.19 protocol.c,1.29,1.30

[Lee Salzman]

Update of /home/enet/cvsroot/enet
In directory sferik:/tmp/cvs-serv29071

Modified Files:
	peer.c protocol.c 
Log Message:
much saner throttle, less sensitive to noise but good response to spikes


Index: peer.c
===================================================================
RCS file: /home/enet/cvsroot/enet/peer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- peer.c	2003/12/15 03:20:33	1.18
+++ peer.c	2003/12/17 00:33:33	1.19
@@ -78,7 +78,7 @@
         return 1;
     }
     else
-    if (rtt > peer -> bestRoundTripTime + peer -> roundTripTimeVariance)
+    if (rtt > peer -> bestRoundTripTime + 2 * peer -> roundTripTimeVariance)
     {
         if (peer -> packetThrottle > peer -> packetThrottleDeceleration)
           peer -> packetThrottle -= peer -> packetThrottleDeceleration;

Index: protocol.c
===================================================================
RCS file: /home/enet/cvsroot/enet/protocol.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- protocol.c	2003/12/16 23:22:24	1.29
+++ protocol.c	2003/12/17 00:33:33	1.30
@@ -446,6 +446,8 @@
 
     roundTripTime = ENET_TIME_DIFFERENCE (timeCurrent, receivedSentTime);
 
+    enet_peer_throttle (peer, roundTripTime);
+
     peer -> roundTripTimeVariance -= peer -> roundTripTimeVariance / 4;
 
     if (roundTripTime >= peer -> roundTripTime)
@@ -469,8 +471,6 @@
     if (peer -> roundTripTime < peer -> bestRoundTripTime)
       peer -> bestRoundTripTime = peer -> roundTripTime;
 
-    enet_peer_throttle (peer, roundTripTime);
-         
     receivedReliableSequenceNumber = ENET_NET_TO_HOST_32 (command -> acknowledge.receivedReliableSequenceNumber);
 
     commandNumber = enet_protocol_remove_sent_reliable_command (peer, receivedReliableSequenceNumber, command -> header.channelID);