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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC vs.
Revision 1.56 by root, Tue May 6 16:55:26 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 (©) 2001,2007 Mark Wedel
  * 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
  * Image related communication
  *
 #include <global.h>
 #include <sproto.h>
 #include "crc.h"
-#define MAX_FACE_SETS	20  /**< Maximum number of image sets the program will handle */
-/** Information about one image */
-typedef struct FaceInfo
-{
-  uint8 *data;              /**< image data */
-  uint16 datalen;           /**< length of the xpm data */
-  uint32 checksum;          /**< Checksum of face data */
-} FaceInfo;
-/** Information about one face set */
-typedef struct
-{
-  char *prefix;         /**< */
-  char *fullname;
-  uint8 fallback;       /**< faceset to use when an image is not found in this faceset */
-  char *size;
-  char *extension;
-  char *comment;
-  FaceInfo *faces;      /**< images in this faceset */
-} FaceSets;
-static FaceSets facesets[MAX_FACE_SETS];    /**< All facesets */
-/**
- * Checks specified faceset is valid
- * \param fsn faceset number
- */
-int
-is_valid_faceset (int fsn)
-{
-  if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
-    return TRUE;
-  return FALSE;
-}
-/**
- * Frees all faceset information
- */
-void
-free_socket_images (void)
-{
-  int num, q;
-  for (num = 0; num < MAX_FACE_SETS; num++)
-    {
-      if (facesets[num].prefix)
-        {
-          for (q = 0; q < faces.size (); q++)
-            if (facesets[num].faces[q].data)
-              free (facesets[num].faces[q].data);
-          free (facesets[num].prefix);
-          free (facesets[num].fullname);
-          free (facesets[num].size);
-          free (facesets[num].extension);
-          free (facesets[num].comment);
-          free (facesets[num].faces);
-        }
-    }
-}
-/**
- * This returns the set we will actually use when sending
- * a face.  This is used because the image files may be sparse.
- * This function is recursive.  imageno is the face number we are
- * trying to send
- *
- * If face is not found in specified faceset, tries with 'fallback' faceset.
- *
- * \param faceset faceset to check
- * \param imageno image number
- *
- */
-static int
-get_face_fallback (int faceset, int imageno)
-{
-  /* faceset 0 is supposed to have every image, so just return.  Doing
-   * so also prevents infinite loops in the case if it not having
-   * the face, but in that case, we are likely to crash when we try
-   * to access the data, but that is probably preferable to an infinite
-   * loop.
-   */
-  if (faceset == 0)
-    return 0;
-  if (!facesets[faceset].prefix)
-    {
-      LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
-      return 0;                 /* use default set */
-    }
-  if (facesets[faceset].faces[imageno].data)
-    return faceset;
-  return get_face_fallback (facesets[faceset].fallback, imageno);
-}
-/**
- * Checks fallback are correctly defined.
- * This is a simple recursive function that makes sure the fallbacks
- * are all proper (eg, the fall back to defined sets, and also
- * eventually fall back to 0).  At the top level, togo is set to MAX_FACE_SETS,
- * if togo gets to zero, it means we have a loop.
- * This is only run when we first load the facesets.
- */
-static void
-check_faceset_fallback (int faceset, int togo)
-{
-  int fallback = facesets[faceset].fallback;
-  /* proper case - falls back to base set */
-  if (fallback == 0)
-    return;
-  if (!facesets[fallback].prefix)
-    {
-      LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
-      abort ();
-    }
-  togo--;
-  if (togo == 0)
-    {
-      LOG (llevError, "Infinite loop found in facesets. aborting.\n");
-      abort ();
-    }
-  check_faceset_fallback (fallback, togo);
-}
 #define MAX_IMAGE_SIZE 10000
 /**
  * Client tells us what type of faces it wants.  Also sets
  * the caching attribute.
 {
   int idx = 0, pri = 0;
   sscanf (buf, "%d %d", &idx, &pri);
+  //TODO: somehow fetch default priority from send_fx here
   const facedata *d = face_data (idx, ns->faceset);
   if (!d)
     return; // doh
   ix.pri = pri;
   ix.idx = idx;
   ix.ofs = d->data.size ();
-  // this is (hopefully) a temporary fix around older cfplus versions not
+  auto (pos, ns->ixface.end ());
+  if (ns->fxix < 2)
+    {
+      // gcfclient does not support prioritising, older cfplus versions
-  // supporting interleaved transfers
+      // do not support interleaved transfers.
-  ns->ixface.insert (ns->ixface.begin (), ix);
+      if (!ns->ixface.empty ())
+        pos = ns->ixface.end () - 1;
+    }
+  else
+    {
+      // the by far most common case will be to insert
+      // near the end, so little looping.
+      while (pos != ns->ixface.begin ())
+        {
+          --pos;
+          // sort within 2k bins, to slightly prefer smaller images
+          if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
+            {
+              ++pos;
+              break;
+            }
+        }
+    }
+  ns->ixface.insert (pos, ix);
 #if 0
-  // the by far most common case will be to insert
+  for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
-  // right at the end, so no looping.
+    fprintf (stderr, "<%d,%d> ",  i->pri, i->ofs);
-  auto (i, ns->ixface.end ());
+  fprintf (stderr, "\n");
-  for (; i != ns->ixface.begin (); )
-    if (pri >= (--i)->pri)
-      break;
-  ns->ixface.insert (i, ix);
 #endif
 }
 /**
  * Tells client the picture it has to use
  * to smooth a picture number given as argument.
  */
 void
 AskSmooth (char *buf, int len, client *ns)
 {
-  ns->send_face (atoi (buf));
+  ns->send_face (atoi (buf), -100);
   ns->flush_fx ();
 }
 // how lame
 static void print_facename (packet &sl, const facedata &d)
  * this is needed for the askface, in which we really do want to send the
  * face (and askface is the only place that should be setting it).  Otherwise,
  * we look at the facecache, and if set, send the image name.
  */
 void
-client::send_face (faceidx facenum)
+client::send_face (faceidx facenum, int pri)
 {
   // never send face 0. ever. it does not exist.
   if (!facenum)
     return;
-  const facedata *d = face_data (facenum, faceset);
+  faceinfo *f = face_info (facenum);
-  if (!d)
+  if (!f)
     {
-      LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
+      LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
       return;
     }
+  // refuse to send non-image faces
+  if (!fx_want [f->type])
+    return;
-  if (faces_sent[facenum])
+  if (faces_sent [facenum])
     return;
   faces_sent[facenum] = true;
   // if for some reason we let a client without face caching connect,
   if (fxix)
     {
       fxface.push_back (facenum);
       return;
     }
+  const facedata *d = f->data (faceset);
   packet sl;
   if (force_face0)
     sl << "face "  << uint16 (facenum);
   print_facename (sl, *d);
   send_packet (sl);
   if (EMI_smooth)
     {
-      faceinfo *f = face_info (facenum);
       if (f->smooth)
         {
           send_face (f->smooth);
           packet sl ("smooth");
 {
   while (!fxface.empty ())
     {
       packet fx ("fx");
       packet sx ("sx");
+      int type = 0;
       do
         {
           faceidx facenum = fxface.back (); fxface.pop_back ();
-          const facedata *d = face_data (facenum, faceset);
+          if (const faceinfo *f = face_info (facenum))
-          if (d)
             {
+              if (f->type != type)
+                {
+                  type = f->type;
+                  fx << ber32 (0)
+                     << uint8 (1) << uint8 (type);
+                }
+              const facedata *d = f->data (faceset);
               fx << ber32 (facenum)
                  << data8 (d->chksum, CHKSUM_SIZE);
               if (smoothing)
                 {
                   faceinfo *f = face_info (facenum);
                   if (f->smooth)
                     {
-                      send_face (f->smooth);
+                      send_face (f->smooth, -110);
                       sx << ber32 (facenum)
                          << ber32 (f->smooth)
                          << ber32 (f->smoothlevel);
                     }
                 }
             }
         }
       while (!fxface.empty ()
-             && fx.room () > ber32::size + CHKSUM_SIZE + 1
+             && fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */
              && sx.room () > ber32::size * 3);
       send_packet (fx);
       if (sx.length () > 3) send_packet (sx);
     }
     {
       LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
       return;
     }
-  //TODO: check type here?
   if (force_image_newmap)
     force_newmap = true;
   packet sl;
 // animations look much smoother, and every client
 // is supposed to do client-side caching anyways.
 void
 client::send_faces (object *ob)
 {
-  send_face (ob->face);
+  send_face (ob->face, 10);
   if (ob->animation_id)
     {
       animation &anim = animations [ob->animation_id];
       for (int i = 0; i < anim.num_animations; i++)
-        send_face (anim.faces [i]);
+        send_face (anim.faces [i], -10);
     }
 }
 /**
  * Need to send an animation sequence to the client.
   /* Build up the list of faces.  Also, send any information (ie, the
    * the face itself) down to the client.
    */
   for (int i = 0; i < animations[anim_num].num_animations; i++)
     {
-      send_face (animations[anim_num].faces[i]);
+      send_face (animations[anim_num].faces[i], -20);
       sl << uint16 (animations[anim_num].faces[i]);   /* flags - not used right now */
     }
   send_packet (sl);
     }
   sl.printf ("replyinfo image_sums %d %d ", start, stop);
   for (int i = start; i <= stop && i < faces.size (); i++)
-    {
+    if (const faceinfo *f = face_info (i))
+      if (ns->fx_want [f->type])
+        {
-      ns->faces_sent[i] = true;
+          ns->faces_sent[i] = true;
-      const facedata *d = face_data (i, ns->faceset);
+          const facedata *d = f->data (ns->faceset);
-      if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
+          if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
-        break;
+            break;
-      sl << uint16 (i)
+          sl << uint16 (i)
-         << uint32 (0) // checksum
+             << uint32 (0) // checksum
-         << uint8  (ns->faceset);
+             << uint8  (ns->faceset);
-      print_facename (sl, *d); sl << uint8 (0);
+          print_facename (sl, *d); sl << uint8 (0);
-    }
+        }
   /* It would make more sense to catch this pre-emptively in the code above.
    * however, if this really happens, we probably just want to cut down the
    * size to less than 1000, since that is what we claim the protocol would
    * support.
    */
   //TODO: taken care of above, should simply abort or make sure the above code is correct
-  if (sl.length () >= MAXSOCKBUF)
+  if (sl.length () > MAXSOCKBUF)
     {
       LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
       abort ();
     }

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC vs. Revision 1.56 by root, Tue May 6 16:55:26 2008 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC vs.
Revision 1.56 by root, Tue May 6 16:55:26 2008 UTC