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

Comparing deliantra/server/common/image.C (file contents):
Revision 1.12 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.17 by root, Thu Feb 15 18:09:33 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
 #include <global.h>
 #include <stdio.h>
+#include "crc.h"
-New_Face *new_faces;
+facetile *new_faces;
 /* bmappair and xbm are used when looking for the image id numbers
  * of a face by name.  xbm is sorted alphabetically so that bsearch
  * can be used to quickly find the entry for a name.  the number is
  * then an index into the new_faces array.
 {
   char *name;
   unsigned int number;
 };
-void free (bmappair *);         // guard to catch free when delete should be used
 static struct bmappair *xbm = NULL;
-/* Following can just as easily be pointers, but
- * it is easier to keep them like this.
- */
-New_Face *blank_face, *dark_faces[3], *empty_face, *smooth_face;
+facetile *blank_face, *dark_faces[3], *empty_face, *smooth_face;
 /* nroffiles is the actual number of bitmaps defined.
  * nrofpixmaps is the number of bitmaps loaded.  With
  * the automatic generation of the bmaps file, this is now equal
  * to nroffiles.
 int nrofpixmaps = 0;
 /**
  * id is the face to smooth, smooth is the 16x2 face used to smooth id.
  */
-struct smoothing:zero_initialised
+struct smoothing : zero_initialised
 {
   uint16 id;
   uint16 smooth;
 };
-void free (smoothing *);        // guard to catch free when delete should be used
 /**
  * Contains all defined smoothing entries. smooth is an array of nrofsmooth
  * entries. It is sorted by smooth[].id.
  */
  */
 static void
 ReadFaceData (void)
 {
   char buf[MAX_BUF], *cp;
-  New_Face *on_face = NULL;
+  facetile *on_face = NULL;
   FILE *fp;
   sprintf (buf, "%s/faces", settings.datadir);
   LOG (llevDebug, "Reading faces from %s...\n", buf);
   if ((fp = fopen (buf, "r")) == NULL)
 {
   char buf[MAX_BUF], *p, *q;
   FILE *fp;
   int value, nrofbmaps = 0, i;
   size_t l;
+  crc32 crc;
-  bmaps_checksum = 0;
   sprintf (buf, "%s/bmaps", settings.datadir);
   LOG (llevDebug, "Reading bmaps from %s...\n", buf);
   if ((fp = fopen (buf, "r")) == NULL)
     {
       LOG (llevError, "Cannot open bmaps file %s: %s\n", buf, strerror (errno));
       if (!(p = strtok (p, " \t")) || !(q = strtok (NULL, " \t\n")))
         {
           LOG (llevDebug, "Warning, syntax error: %s\n", buf);
           continue;
         }
       value = atoi (p);
       xbm[nroffiles].name = strdup (q);
       /* We need to calculate the checksum of the bmaps file
        * name->number mapping to send to the client.  This does not
        * need to match what sum or other utility may come up with -
        * as long as we get the same results on the same real file
        * data, it does the job as it lets the client know if
        * the file has the same data or not.
        */
-      ROTATE_RIGHT (bmaps_checksum);
+      crc (value);
-      bmaps_checksum += value & 0xff;
+      crc (value >> 8);
-      bmaps_checksum &= 0xffffffff;
-      ROTATE_RIGHT (bmaps_checksum);
-      bmaps_checksum += (value >> 8) & 0xff;
-      bmaps_checksum &= 0xffffffff;
       for (l = 0; l < strlen (q); l++)
-        {
+        crc (q [l]);
-          ROTATE_RIGHT (bmaps_checksum);
-          bmaps_checksum += q[l];
-          bmaps_checksum &= 0xffffffff;
-        }
       xbm[nroffiles].number = value;
       nroffiles++;
       if (value >= nrofpixmaps)
         nrofpixmaps = value + 1;
     }
   fclose (fp);
   LOG (llevDebug, "done (got %d/%d/%d)\n", nrofpixmaps, nrofbmaps, nroffiles);
-  new_faces = new New_Face[nrofpixmaps];
+  new_faces = new facetile[nrofpixmaps];
   for (i = 0; i < nrofpixmaps; i++)
     {
       new_faces[i].name = "";
       new_faces[i].number = i;
       new_faces[i].visibility = 0;
       new_faces[i].magicmap = 255;
     }
   for (i = 0; i < nroffiles; i++)
-    {
-      new_faces[xbm[i].number].name = xbm[i].name;
+    new_faces[xbm[i].number].name = xbm[i].name;
-    }
   // non-pod datatype, likely not allowed
   qsort (xbm, nroffiles, sizeof (struct bmappair), (int (*)(const void *, const void *)) compar);
   ReadFaceData ();
   dark_faces[0] = &new_faces[FindFace (DARK_FACE1_NAME, 0)];
   dark_faces[1] = &new_faces[FindFace (DARK_FACE2_NAME, 0)];
   dark_faces[2] = &new_faces[FindFace (DARK_FACE3_NAME, 0)];
   smooth_face = &new_faces[FindFace (SMOOTH_FACE_NAME, 0)];
+  bmaps_checksum = crc;
 }
 /* This returns an the face number of face 'name'.  Number is constant
  * during an invocation, but not necessarily between versions (this
  * is because the faces are arranged in alphabetical order, so
 {
   char buf[MAX_BUF], *p, *q;
   FILE *fp;
   int smoothcount = 0;
-  bmaps_checksum = 0;
   sprintf (buf, "%s/smooth", settings.datadir);
   LOG (llevDebug, "Reading smooth from %s...\n", buf);
   if ((fp = fopen (buf, "r")) == NULL)
     {
       LOG (llevError, "Cannot open smooth file %s: %s\n", strerror (errno));

Diff Legend

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

Comparing deliantra/server/common/image.C (file contents): Revision 1.12 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs. Revision 1.17 by root, Thu Feb 15 18:09:33 2007 UTC

Diff Legend

Comparing deliantra/server/common/image.C (file contents):
Revision 1.12 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.17 by root, Thu Feb 15 18:09:33 2007 UTC