ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.66 by root, Mon Jul 30 02:03:03 2007 UTC vs.
Revision 1.68 by root, Thu Aug 9 04:11:24 2007 UTC

153 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss, 153 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
154 154
155 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); 155 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
156#endif 156#endif
157 157
158 // fast-time-out a player by checking for missign acks
158 // do this only when player is active 159 // do this only when player is active
159 if (pl && pl->active 160 if (pl && pl->active
160 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 161 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
161 { 162 {
162 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); 163 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
189 { 190 {
190 ++scrub_idx; 191 ++scrub_idx;
191 192
192 if (!faces_sent [scrub_idx]) 193 if (!faces_sent [scrub_idx])
193 if (faceinfo *f = face_info (scrub_idx)) 194 if (faceinfo *f = face_info (scrub_idx))
194 if (f->type == FT_FACE) // only scrub faces for now 195 if (f->type == FT_FACE || f->type == FT_SOUND) // only scrub faces and sounds for now
195 { 196 {
196 send_face (scrub_idx, -120); 197 send_face (scrub_idx, -120);
197 flush_fx (); 198 flush_fx ();
198 199
199 bg_scrub = 1; // send up to one fx per tick, unless an image was requested 200 bg_scrub = 1; // send up to one fx per tick, unless an image was requested

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines