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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.68 by root, Thu Jan 4 16:19:31 2007 UTC vs.
Revision 1.69 by root, Thu Jan 4 16:56:39 2007 UTC

  * the value of orig_map->tile_map[tile_num].
  */
 static inline maptile *
 find_and_link (maptile *orig_map, int tile_num)
 {
-  maptile *mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
+  maptile *mp = orig_map->tile_map [tile_num];
   if (!mp)
     {
+      mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
+      if (!mp)
+        {
-      // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
+          // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
-      LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
+          LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
-           &orig_map->tile_path[tile_num], &orig_map->path);
+               &orig_map->tile_path[tile_num], &orig_map->path);
-      mp = new maptile (1, 1);
+          mp = new maptile (1, 1);
-      mp->alloc ();
+          mp->alloc ();
-      mp->in_memory = MAP_IN_MEMORY;
+          mp->in_memory = MAP_IN_MEMORY;
+        }
     }
   int dest_tile = (tile_num + 2) % 4;
-  orig_map->tile_map[tile_num] = mp;
+  orig_map->tile_map [tile_num] = mp;
   // optimisation: back-link map to origin map if euclidean
   //TODO: non-euclidean maps MUST GO
   if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
     orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;

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