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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.31 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.38 by pippijn, Mon Dec 11 19:46:46 2006 UTC

 #include <global.h>
 #include <funcpoint.h>
 #include <loader.h>
-#ifndef WIN32                   /* ---win32 exclude header */
-# include <unistd.h>
+#include <unistd.h>
-#endif /* win32 */
 #include "path.h"
-extern int nrofallocobjects, nroffreeobjects;
 /*
  * Returns the maptile which has a name matching the given argument.
  * return NULL if no match is found.
  */
 int
 check_path (const char *name, int prepend_dir)
 {
   char buf[MAX_BUF];
-#ifndef WIN32
   char *endbuf;
   struct stat statbuf;
   int mode = 0;
-#endif
   if (prepend_dir)
     strcpy (buf, create_pathname (name));
   else
     strcpy (buf, name);
-#ifdef WIN32                    /* ***win32: check this sucker in windows style. */
-  return (_access (buf, 0));
-#else
   /* old method (strchr(buf, '\0')) seemd very odd to me -
    * this method should be equivalant and is clearer.
    * Can not use strcat because we need to cycle through
    * all the names.
   if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
       (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
     mode |= 2;
   return (mode);
-#endif
 }
 /*
  * Prints out debug-information about a map.
  * Dumping these at llevError doesn't seem right, but is
   retval |= mp->spaces[newx + mp->width * newy].flags;
   return retval;
 }
 /*
  * Returns true if the given coordinate is blocked except by the
  * object passed is not blocking.  This is used with
  * multipart monsters - if we want to see if a 2x2 monster
  * can move 1 space to the left, we don't want its own area
  * monster.
  * m, x, y are the target map/coordinates - needed for map tiling.
  * the coordinates & map passed in should have been updated for tiling
  * by the caller.
  */
 int
 blocked_link (object *ob, maptile *m, int sx, int sy)
 {
   object *tmp;
   int mflags, blocked;
           }                     /* for this space */
       }                         /* for this j */
 }
+maptile::maptile ()
+{
+  in_memory = MAP_SWAPPED;
+  /* The maps used to pick up default x and y values from the
+   * map archetype.  Mimic that behaviour.
+   */
+  MAP_WIDTH (this) = 16;
+  MAP_HEIGHT (this) = 16;
+  MAP_RESET_TIMEOUT (this) = 0;
+  MAP_TIMEOUT (this) = 300;
+  MAP_ENTER_X (this) = 0;
+  MAP_ENTER_Y (this) = 0;
+  /*set part to -1 indicating conversion to weather map not yet done */
+  MAP_WORLDPARTX (this) = -1;
+  MAP_WORLDPARTY (this) = -1;
+}
 /*
  * Allocates, initialises, and returns a pointer to a maptile.
  * Modified to no longer take a path option which was not being
  * used anyways.  MSW 2001-07-01
  */
 maptile *
 get_linked_map (void)
 {
-  maptile *map = new maptile;
+  maptile *mp, *map = new maptile;
-  maptile *mp;
-  for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next);
+  for (mp = first_map; mp && mp->next; mp = mp->next);
   if (mp == NULL)
     first_map = map;
   else
     mp->next = map;
-  map->in_memory = MAP_SWAPPED;
-  /* The maps used to pick up default x and y values from the
-   * map archetype.  Mimic that behaviour.
-   */
-  MAP_WIDTH (map) = 16;
-  MAP_HEIGHT (map) = 16;
-  MAP_RESET_TIMEOUT (map) = 0;
-  MAP_TIMEOUT (map) = 300;
-  MAP_ENTER_X (map) = 0;
-  MAP_ENTER_Y (map) = 0;
-  /*set part to -1 indicating conversion to weather map not yet done */
-  MAP_WORLDPARTX (map) = -1;
-  MAP_WORLDPARTY (map) = -1;
   return map;
 }
 /*
  * Allocates the arrays contained in a maptile.
  * This basically allocates the dynamic array of spaces for the
  * map.
  */
 void
-allocate_map (maptile *m)
+maptile::allocate ()
 {
-  m->in_memory = MAP_IN_MEMORY;
+  in_memory = MAP_IN_MEMORY;
   /* Log this condition and free the storage.  We could I suppose
    * realloc, but if the caller is presuming the data will be intact,
    * that is their poor assumption.
    */
-  if (m->spaces)
+  if (spaces)
     {
-      LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path);
+      LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
-      free (m->spaces);
+      free (spaces);
     }
-  m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace));
+  spaces = (MapSpace *)
+    calloc (1, width * height * sizeof (MapSpace));
-  if (m->spaces == NULL)
+  if (!spaces)
     fatal (OUT_OF_MEMORY);
 }
 /* Create and returns a map of the specific size.  Used
  * in random map code and the editor.
   maptile *m = get_linked_map ();
   m->width = sizex;
   m->height = sizey;
   m->in_memory = MAP_SWAPPED;
-  allocate_map (m);
+  m->allocate ();
   return m;
 }
 /* Takes a string from a map definition and outputs a pointer to the array of shopitems
  * corresponding to that string. Memory is allocated for this, it must be freed
 {
   char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
   int msgpos = 0;
   int maplorepos = 0;
-  while (fgets (buf, HUGE_BUF - 1, fp) != NULL)
+  while (fgets (buf, HUGE_BUF, fp) != NULL)
     {
       buf[HUGE_BUF - 1] = 0;
       key = buf;
       while (isspace (*key))
         key++;
       if (*key == 0)
         continue;               /* empty line */
       value = strchr (key, ' ');
       if (!value)
         {
-          end = strchr (key, '\n');
+          if ((end = strchr (key, '\n')))
-          if (end != NULL)
-            {
-              *end = 0;
+            *end = 0;
-            }
         }
       else
         {
           *value = 0;
           value++;
           end = strchr (value, '\n');
           while (isspace (*value))
             {
               value++;
               if (*value == '\0' || value == end)
                 {
                   /* Nothing but spaces. */
                   value = NULL;
                   break;
        * that use the parameter.
        */
       if (!strcmp (key, "msg"))
         {
-          while (fgets (buf, HUGE_BUF - 1, fp) != NULL)
+          while (fgets (buf, HUGE_BUF, fp) != NULL)
             {
               if (!strcmp (buf, "endmsg\n"))
                 break;
               else
                 {
           if (msgpos != 0)
             m->msg = strdup_local (msgbuf);
         }
       else if (!strcmp (key, "maplore"))
         {
-          while (fgets (buf, HUGE_BUF - 1, fp) != NULL)
+          while (fgets (buf, HUGE_BUF, fp) != NULL)
             {
               if (!strcmp (buf, "endmaplore\n"))
                 break;
               else
                 {
       LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
       delete_map (m);
       return NULL;
     }
-  allocate_map (m);
+  m->allocate ();
   m->in_memory = MAP_LOADING;
   load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
   m->in_memory = MAP_IN_MEMORY;
       LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
       delete_map (m);
       m = load_original_map (m->path, 0);
       return NULL;
     }
-  allocate_map (m);
+  m->allocate ();
   m->in_memory = MAP_LOADING;
   load_objects (m, thawer, 0);
   m->in_memory = MAP_IN_MEMORY;
       LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
       delete_map (m);
       m = load_original_map (m->path, 0);
       return NULL;
     }
-  /*allocate_map(m); */
+  /*m->allocate ();*/
   m->in_memory = MAP_LOADING;
   load_objects (m, thawer, MAP_OVERLAY);
   m->in_memory = MAP_IN_MEMORY;
       print_shop_string (m, shop);
       fprintf (freezer, "shopitems %s\n", shop);
     }
   if (m->shopgreed)
     fprintf (freezer, "shopgreed %f\n", m->shopgreed);
-#ifndef WIN32
   if (m->shopmin)
     fprintf (freezer, "shopmin %llu\n", m->shopmin);
   if (m->shopmax)
     fprintf (freezer, "shopmax %llu\n", m->shopmax);
-#else
-  if (m->shopmin)
-    fprintf (freezer, "shopmin %I64u\n", m->shopmin);
-  if (m->shopmax)
-    fprintf (freezer, "shopmax %I64u\n", m->shopmax);
-#endif
   if (m->shoprace)
     fprintf (freezer, "shoprace %s\n", m->shoprace);
   if (m->darkness)
     fprintf (freezer, "darkness %d\n", m->darkness);
   if (m->width)

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.31 by root, Sat Sep 16 22:24:12 2006 UTC vs. Revision 1.38 by pippijn, Mon Dec 11 19:46:46 2006 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.31 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.38 by pippijn, Mon Dec 11 19:46:46 2006 UTC