[ViewVC] Diff of: cvs/deliantra/server/socket/loop.C

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.68 by root, Thu Aug 9 04:11:24 2007 UTC vs.
Revision 1.78 by root, Sat Dec 27 01:25:00 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /**
  * \file
  * Main client/server loops.
 #define MAX_QUEUE_DEPTH   50
 #define MAX_QUEUE_BACKLOG 3.
 // disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
+#define SOCKET_TIMEOUT 16.
 void
 client::reset_state ()
 {
   if (!pl)
       reset_state ();
       send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
     }
   else
     {
-      cmd_queue.push_back (command ());
+      cmd_queue.resize (cmd_queue.size () + 1);
       command &cmd = cmd_queue.back ();
       cmd.stamp   = stamp;
       cmd.handler = handler;
       cmd.data    = salloc<char> (datalen + 1, data);
       cmd.datalen = datalen;
           send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
         }
       else
         execute (cmd.handler, cmd.data, cmd.datalen);
+      sfree<char> (cmd.data, cmd.datalen + 1);
       cmd_queue.pop_front ();
       return true;
     }
   else
     return false;
 void
 client::tick ()
 {
   if (!pl || destroyed ())
     return;
+  pl->dirty = true;
   /* Update the players stats once per tick.  More efficient than
    * sending them whenever they change, and probably just as useful
    */
   esrv_update_stats (pl);
-  if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
+  sint32 weight = pl->ob->client_weight ();
+  if (last_weight != weight)
     {
+      pl->ob->update_stats ();
       esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-      if (last_weight != WEIGHT (pl->ob))
-        LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
-             (unsigned long) last_weight, WEIGHT (pl->ob));
     }
   draw_client_map (pl);
   if (update_look)
     esrv_draw_look (pl);
+  mapinfo_queue_run ();
 #if HAVE_TCP_INFO
   // check time of last ack, and, if too old, kill connection
   socklen_t len = sizeof (tcpi);
 #if HAVE_TCP_INFO
   // further restrict the available bandwidth by the excess bandwidth available
   max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
 #endif
-  // if we can split images, round to next-lowest mss
+  // round to next-lowest mss
-  if (fxix) max_send -= max_send % mss;
+  max_send -= max_send % mss;
   if (ixface.empty ())
     {
       // regularly send a new face when queue is empty
-      if (bg_scrub && !--bg_scrub && enable_bg_scrub)
+      if (bg_scrub && !--bg_scrub)
         while (scrub_idx < faces.size () - 1)
           {
             ++scrub_idx;
             if (!faces_sent [scrub_idx])
           ixsend &ix = ixface.back ();
           if (facedata *d = face_data (ix.idx, faceset))
             {
-              if (fxix)
-                {
-                  // estimate the packet header overhead "ix " + idx + (new)ofs
+              // estimate the packet header overhead "ix " + idx + (new)ofs
-                  int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
+              int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
-                  int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
+              int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
-                  // only transfer something if the amount of data transferred
+              // only transfer something if the amount of data transferred
-                  // has a healthy relation to the header overhead
+              // has a healthy relation to the header overhead
-                  if (chunk < 64)
+              if (chunk < 64)
-                    break;
+                break;
-                  chunk = min (chunk, (int)ix.ofs);
+              chunk = min (chunk, (int)ix.ofs);
-                  ix.ofs -= chunk;
+              ix.ofs -= chunk;
-                  //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
+              //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
-                  packet sl ("ix");
+              packet sl ("ix");
-                  sl << ber32 (ix.idx)
+              sl << ber32 (ix.idx)
-                     << ber32 (ix.ofs)
+                 << ber32 (ix.ofs)
-                     << data (d->data.data () + ix.ofs, chunk);
+                 << data (d->data.data () + ix.ofs, chunk);
-                  send_packet (sl);
+              send_packet (sl);
-                }
-              else
-                {
-                  send_image (ix.idx);
-                  ix.ofs = 0;
-                }
             }
           else
             ix.ofs = 0;
           if (!ix.ofs)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.68 by root, Thu Aug 9 04:11:24 2007 UTC vs. Revision 1.78 by root, Sat Dec 27 01:25:00 2008 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.68 by root, Thu Aug 9 04:11:24 2007 UTC vs.
Revision 1.78 by root, Sat Dec 27 01:25:00 2008 UTC