--- deliantra/server/socket/image.C	2007/04/10 09:35:24	1.40
+++ deliantra/server/socket/image.C	2007/07/12 18:48:20	1.48
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT 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 2 of the License, or
+ * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /** \file
@@ -193,14 +192,71 @@
 }
 
 /**
- * Client has requested pixmap that it somehow missed getting.
- * This will be called often if the client is
- * caching images.
+ * client requested an image. send it rate-limited
+ * before flushing.
  */
 void
-SendFaceCmd (char *buf, int len, client *ns)
+AskFaceCmd (char *buf, int len, client *ns)
 {
-  ns->send_image (atoi (buf));
+  int idx = 0, pri = 0;
+
+  sscanf (buf, "%d %d", &idx, &pri);
+
+  const facedata *d = face_data (idx, ns->faceset);
+
+  if (!d)
+    return; // doh
+
+  client::ixsend ix;
+
+  ix.pri = pri;
+  ix.idx = idx;
+  ix.ofs = d->data.size ();
+
+  auto (pos, ns->ixface.end ());
+
+  if (ns->fxix < 2)
+    {
+      // gcfclient does not support prioritising, older cfplus versions
+      // do not support interleaved transfers.
+      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
+  for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
+    fprintf (stderr, "<%d,%d> ",  i->pri, i->ofs);
+  fprintf (stderr, "\n");
+#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->flush_fx ();
 }
 
 // how lame
@@ -252,10 +308,12 @@
       return;
     }
 
-  if (faces_sent[facenum])
+  // refuse tos end non-image faces
+  if (d->type)
     return;
 
-  faces_sent[facenum] = true;
+  if (!must_send_face (facenum))
+    return;
 
   // if for some reason we let a client without face caching connect,
   // we better support that decision here and implement it.
@@ -349,13 +407,15 @@
 
   const facedata *d = face_data (facenum, faceset);
 
+  faces_sent[facenum] = true;
+
   if (!d)
     {
       LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
       return;
     }
-
-  faces_sent[facenum] = true;
+  
+  //TODO: check type here?
 
   if (force_image_newmap)
     force_newmap = true;
@@ -406,7 +466,7 @@
    * are added in contigous order, so if the number is in the valid
    * range, it must be a valid animation.
    */
-  if (anim_num < 0 || anim_num > num_animations)
+  if (anim_num < 0 || anim_num >= animations.size ())
     {
       LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
       return;