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.58 by root, Thu Jul 5 10:34:08 2007 UTC vs.
Revision 1.62 by root, Thu Jul 26 21:44:43 2007 UTC

166 { 166 {
167 ++scrub_idx; 167 ++scrub_idx;
168 168
169 if (!faces_sent [scrub_idx]) 169 if (!faces_sent [scrub_idx])
170 { 170 {
171 send_face (scrub_idx); 171 send_face (scrub_idx, -120);
172 flush_fx (); 172 flush_fx ();
173 173
174 bg_scrub = 1; // send up to one face per tick, unless an image was requested 174 bg_scrub = 1; // send up to one face per tick, unless an image was requested
175 break; 175 break;
176 } 176 }
177 } 177 }
178 178
179 rate_avail = max_rate - outputbuffer_len (); 179 rate_avail = max_rate - outputbuffer_len ();
180 } 180 }
181 else 181 else if (outq < 4096) // only send when bandwidth allows it. the 4k is completely arbitrary :(
182 { 182 {
183 int ol = outputbuffer_len (); 183 int ol = outputbuffer_len ();
184 184
185 rate_avail = min (max_rate, rate_avail + max_rate); 185 rate_avail = min (max_rate, rate_avail + max_rate);
186 rate_avail -= ol; 186 rate_avail -= ol;
211 211
212 if (chunk <= 0) 212 if (chunk <= 0)
213 break; 213 break;
214 214
215 ix.ofs -= chunk; 215 ix.ofs -= chunk;
216
217 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
216 218
217 packet sl ("ix"); 219 packet sl ("ix");
218 220
219 sl << ber32 (ix.idx) 221 sl << ber32 (ix.idx)
220 << ber32 (ix.ofs) 222 << ber32 (ix.ofs)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines