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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC

 }
 void
 maptile::activate ()
 {
-  if (in_memory != MAP_INACTIVE)
+  if (state != MAP_INACTIVE)
     return;
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
       op->activate_recursive ();
-  in_memory = MAP_ACTIVE;
+  state = MAP_ACTIVE;
+  activate_physics ();
 }
 void
 maptile::deactivate ()
 {
-  if (in_memory != MAP_ACTIVE)
+  if (state != MAP_ACTIVE)
     return;
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
       op->deactivate_recursive ();
-  in_memory = MAP_INACTIVE;
+  state = MAP_INACTIVE;
 }
 bool
 maptile::_save_objects (object_freezer &f, int flags)
 {
 }
 void
 maptile::init ()
 {
-  in_memory = MAP_SWAPPED;
+  state = MAP_SWAPPED;
   /* The maps used to pick up default x and y values from the
    * map archetype. Mimic that behaviour.
    */
   width         = 16;
           case KW_value:       case KW_swap_time:       thawer.get (timeout);  break;
           case KW_level:       case KW_difficulty:      thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
           case KW_invisible:   case KW_darkness:        thawer.get (darkness); break;
           case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
-          case KW_tile_path_1: thawer.get (tile_path [0]); break;
+          case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
-          case KW_tile_path_2: thawer.get (tile_path [1]); break;
+          case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
-          case KW_tile_path_3: thawer.get (tile_path [2]); break;
+          case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
-          case KW_tile_path_4: thawer.get (tile_path [3]); break;
+          case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
-          case KW_tile_path_5: thawer.get (tile_path [4]); break;
+          case KW_tile_path_5: thawer.get (tile_path [TILE_UP   ]); break;
-          case KW_tile_path_6: thawer.get (tile_path [5]); break;
+          case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
           case KW_ERROR:
             set_key_text (thawer.kw_str, thawer.value);
             break;
   if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
   MAP_OUT (per_player);
   MAP_OUT (per_party);
-  if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
+  if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
-  if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
+  if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
-  if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
+  if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
-  if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
+  if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
-  if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
+  if (tile_path [TILE_UP   ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP   ]);
-  if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
+  if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
   freezer.put (this);
   freezer.put (KW(end));
   return true;
   msg      = 0;
   maplore  = 0;
   shoprace = 0;
   delete [] shopitems, shopitems = 0;
-  for (int i = 0; i < TILE_NUM; i++)
+  for (int i = 0; i < array_length (tile_path); i++)
     tile_path [i] = 0;
 }
 maptile::~maptile ()
 {
   /* We need to look through all the maps and see if any maps
    * are pointing at this one for tiling information.  Since
    * tiling can be asymetric, we just can not look to see which
    * maps this map tiles with and clears those.
    */
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < array_length (tile_path); i++)
     if (tile_map[i] == m)
       tile_map[i] = 0;
 }
 void
     middle = 0;
   if (top == middle)
     middle = 0;
+  // set lower map transparent floor flag if applicable
+  if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
+    {
+      floor->set_anim_frame (0);
+      if (maptile *m = floor->map->tile_map [TILE_DOWN])
+        {
+          mapspace &ms = m->at (floor->x, floor->y);
+          ms.update ();
+          if (object *floor2 = ms.faces_obj [2])
+            if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
+              {
+                floor->set_anim_frame (1);
+                top = floor;
+                middle = ms.faces_obj [0];
+                floor = floor2;
+              }
+          ms.pflags |= PF_VIS_UP;
+        }
+    }
 #if 0
   faces_obj [0] = top;
   faces_obj [1] = middle;
   faces_obj [2] = floor;
 #endif
 }
+void
+mapspace::update_up ()
+{
+  // invalidate up
+  if (!(pflags & PF_VIS_UP))
+    return;
+  pflags &= ~PF_VIS_UP;
+  if (bot)
+    if (maptile *m = bot->map->tile_map [TILE_UP])
+      m->at (bot->x, bot->y).invalidate ();
+}
 maptile *
 maptile::tile_available (int dir, bool load)
 {
-  if (tile_path[dir])
-    {
-      // map is there and we don't need to load it OR it's loaded => return what we have
+  // map is there and we don't need to load it OR it's loaded => return what we have
-      if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
+  if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
-        return tile_map[dir];
+    return tile_map [dir];
+  if (tile_path [dir])
+    {
       // well, try to locate it then, if possible - maybe it's there already
+      // this is the ONLY place in the server that links maps with each other,
+      // so any kind of inter-map stuff has to be initiated here.
-      if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
+      if (maptile *m = find_async (tile_path [dir], this, load))
+        {
+          bool mismatch = false;
+          if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
+            if (width != m->width)
+              mismatch = true;
+          if (dir == TILE_EAST  || dir == TILE_WEST  || dir == TILE_UP || dir == TILE_DOWN)
+            if (height != m->height)
+              mismatch = true;
+          if (mismatch)
+            {
+              LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
+                   dir, &path, &m->path);
+              m = 0;
+            }
+          // as an optimisation, link us against the other map if the other map
+          // has us as neighbour, which is very common, but not guaranteed.
+          int dir2 = REVERSE_TILE_DIR (dir);
+          if (m->tile_path [dir2] == path)
+            m->tile_map [dir2] = this;
-        return tile_map[dir];
+          return tile_map [dir] = m;
+        }
     }
   return 0;
 }
   if (!m)
     return 0;
   if (x < 0)
     {
-      if (!m->tile_available (3))
+      if (!m->tile_available (TILE_WEST))
         return 1;
-      return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
+      return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
     }
   if (x >= m->width)
     {
-      if (!m->tile_available (1))
+      if (!m->tile_available (TILE_EAST))
         return 1;
-      return out_of_map (m->tile_map[1], x - m->width, y);
+      return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
     }
   if (y < 0)
     {
-      if (!m->tile_available (0))
+      if (!m->tile_available (TILE_NORTH))
         return 1;
-      return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
+      return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
     }
   if (y >= m->height)
     {
-      if (!m->tile_available (2))
+      if (!m->tile_available (TILE_SOUTH))
         return 1;
-      return out_of_map (m->tile_map[2], x, y - m->height);
+      return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
     }
   /* Simple case - coordinates are within this local
    * map.
    */
 maptile *
 maptile::xy_find (sint16 &x, sint16 &y)
 {
   if (x < 0)
     {
-      if (!tile_available (3))
+      if (!tile_available (TILE_WEST))
         return 0;
-      x += tile_map[3]->width;
+      x += tile_map [TILE_WEST]->width;
-      return tile_map[3]->xy_find (x, y);
+      return tile_map [TILE_WEST]->xy_find (x, y);
     }
   if (x >= width)
     {
-      if (!tile_available (1))
+      if (!tile_available (TILE_EAST))
         return 0;
       x -= width;
-      return tile_map[1]->xy_find (x, y);
+      return tile_map [TILE_EAST]->xy_find (x, y);
     }
   if (y < 0)
     {
-      if (!tile_available (0))
+      if (!tile_available (TILE_NORTH))
         return 0;
-      y += tile_map[0]->height;
+      y += tile_map [TILE_NORTH]->height;
-      return tile_map[0]->xy_find (x, y);
+      return tile_map [TILE_NORTH]->xy_find (x, y);
     }
   if (y >= height)
     {
-      if (!tile_available (2))
+      if (!tile_available (TILE_SOUTH))
         return 0;
       y -= height;
-      return tile_map[2]->xy_find (x, y);
+      return tile_map [TILE_SOUTH]->xy_find (x, y);
     }
   /* Simple case - coordinates are within this local
    * map.
    */

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC vs. Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC