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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.202 by root, Fri Apr 22 06:10:32 2011 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <unistd.h>
   return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
 }
 /*
  * 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
  * to block it from moving there.
  * Returns TRUE if the space is blocked by something other than the
  * monster.
 }
 void
 maptile::activate ()
 {
-  if (spaces)
+  if (state != MAP_INACTIVE)
+    return;
-    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-      for (object *op = ms->bot; op; op = op->above)
+    for (object *op = ms->bot; op; op = op->above)
-        op->activate_recursive ();
+      op->activate_recursive ();
+  state = MAP_ACTIVE;
+  activate_physics ();
 }
 void
 maptile::deactivate ()
 {
-  if (spaces)
+  if (state != MAP_ACTIVE)
+    return;
-    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-      for (object *op = ms->bot; op; op = op->above)
+    for (object *op = ms->bot; op; op = op->above)
-        op->deactivate_recursive ();
+      op->deactivate_recursive ();
+  state = MAP_INACTIVE;
 }
 bool
 maptile::_save_objects (object_freezer &f, int flags)
 {
       for (object *op = spaces [i].bot; op; op = op->above)
         {
           unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
-          if (expect_false (!op->can_map_save ()))
+          if (ecb_expect_false (!op->can_map_save ()))
             continue;
-          if (expect_false (unique || op->flag [FLAG_UNIQUE]))
+          if (ecb_expect_false (unique || op->flag [FLAG_UNIQUE]))
             {
               if (flags & IO_UNIQUES)
                 op->write (f);
             }
-          else if (expect_true (flags & IO_OBJECTS))
+          else if (ecb_expect_true (flags & IO_OBJECTS))
             op->write (f);
         }
     }
   coroapi::cede_to_tick ();
 }
 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;
   spaces = salloc0<mapspace> (size ());
 }
 //+GPL
 /* 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
  * at a later date.
  * Called by parse_map_headers below.
  */
 static shopitems *
 parse_shop_string (const char *input_string)
             *q = '\0';
           current_type = get_typedata_by_name (p);
           if (current_type)
             {
-              items[i].name = current_type->name;
+              items[i].name    = current_type->name;
               items[i].typenum = current_type->number;
               items[i].name_pl = current_type->name_pl;
             }
           else
             {                   /* oh uh, something's wrong, let's free up this one, and try
                                  * the next entry while we're at it, better print a warning
                                  */
               LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
             }
         }
           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 < ecb_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 < ecb_array_length (tile_path); i++)
     if (tile_map[i] == m)
       tile_map[i] = 0;
 }
 void
   update_all_map_los (this);
   return 1;
 }
 /*
  * This function updates various attributes about a specific space
  * on the map (what it looks like, whether it blocks magic,
  * has a living creatures, prevents people from passing
  * through, etc)
  */
        * 3 times each time the player moves, because many of the
        * functions the move_player calls eventualy call this.
        *
        * Always put the player down for drawing.
        */
-      if (expect_true (!tmp->invisible))
+      if (ecb_expect_true (!tmp->invisible))
         {
-          if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
+          if (ecb_expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
             top = tmp;
-          else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
+          else if (ecb_expect_false (tmp->flag [FLAG_IS_FLOOR]))
             {
               /* If we got a floor, that means middle and top were below it,
                * so should not be visible, so we clear them.
                */
               middle = 0;
               volume = 0;
               items  = 0;
             }
           else
             {
-              if (expect_true (!tmp->flag [FLAG_NO_PICK]))
+              if (ecb_expect_true (!tmp->flag [FLAG_NO_PICK]))
                 {
                   ++items;
                   volume += tmp->volume ();
                 }
               /* Flag anywhere have high priority */
-              if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
+              if (ecb_expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
                 anywhere = tmp;
               /* Find the highest visible face around.  If equal
                * visibilities, we still want the one nearer to the
                * top
                */
-              if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
+              if (ecb_expect_false (::faces [tmp->face].visibility >= middle_visibility))
                 {
                   middle_visibility = ::faces [tmp->face].visibility;
                   middle = tmp;
                 }
             }
   this->items_     = upos_min (items, 65535); // assume nrof <= 2**31
   /* At this point, we have a floor face (if there is a floor),
    * and the floor is set - we are not going to touch it at
    * this point.
    * middle contains the highest visibility face.
    * top contains a player/monster face, if there is one.
    *
    * We now need to fill in top.face and/or middle.face.
    */
   /* If the top face also happens to be high visibility, re-do our
    * middle face.  This should not happen, as we already have the
    * else statement above so middle should not get set.  OTOH, it
    * may be possible for the faces to match but be different objects.
    */
   if (top == middle)
     middle = 0;
               /* top is already set - we should only get here if
                * middle is not set
                *
                * Set the middle face and break out, since there is nothing
                * more to fill in.  We don't check visiblity here, since
                *
                */
               if (tmp != top)
                 {
                   middle = tmp;
                   break;
     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]->in_memory == MAP_ACTIVE))
+  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;
+            }
+          else if (0)//D
+            {
+              // 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;
 }
 /* this returns TRUE if the coordinates (x,y) are out of
  * map m.  This function also takes into account any
  * tiling considerations, loading adjacant maps as needed.
  * This is the function should always be used when it
  * necessary to check for valid coordinates.
  * This function will recursively call itself for the
  * tiled maps.
  */
 int
 out_of_map (maptile *m, int x, int y)
 {
   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.
    */
 }
 /* This is basically the same as out_of_map above, but
  * instead we return NULL if no map is valid (coordinates
  * out of bounds and no tiled map), otherwise it returns
  * the map as that the coordinates are really on, and
  * updates x and y to be the localised coordinates.
  * Using this is more efficient of calling out_of_map
  * and then figuring out what the real map is
  */
 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.
    */
  * so you just can not look the the map coordinates and get the
  * righte value.  distance_x/y are distance away, which
  * can be negative.  direction is the crossfire direction scheme
  * that the creature should head.  part is the part of the
  * monster that is closest.
  *
  * get_rangevector looks at op1 and op2, and fills in the
  * structure for op1 to get to op2.
  * We already trust that the caller has verified that the
  * two objects are at least on adjacent maps.  If not,
  * results are not likely to be what is desired.
       retval->distance  = upos_max (abs (retval->distance_x), abs (retval->distance_y));
       retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
     }
 }
 /* this is basically the same as get_rangevector above, but instead of
  * the first parameter being an object, it instead is the map
  * and x,y coordinates - this is used for path to player -
  * since the object is not infact moving but we are trying to traverse
  * the path, we need this.
  * flags has no meaning for this function at this time - I kept it in to
  * be more consistant with the above function and also in case they are needed
  * for something in the future.  Also, since no object is pasted, the best
   if (x1 > m->width)
     {
       if (maptile *tile = m->tile_available (TILE_EAST, 1))
         split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
-      if (x0 > m->width) // entirely to the right
+      if (x0 >= m->width) // entirely to the right
         return;
       x1 = m->width;
     }
-  // clip to map above
+  // clip to map to the north
   if (y0 < 0)
     {
       if (maptile *tile = m->tile_available (TILE_NORTH, 1))
         split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
-      if (y1 < 0) // entirely above
+      if (y1 < 0) // entirely to the north
         return;
       y0 = 0;
     }
-  // clip to map below
+  // clip to map to the south
   if (y1 > m->height)
     {
       if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
         split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
-      if (y0 > m->height) // entirely below
+      if (y0 >= m->height) // entirely to the south
         return;
       y1 = m->height;
     }

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.202 by root, Fri Apr 22 06:10:32 2011 UTC vs. Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.202 by root, Fri Apr 22 06:10:32 2011 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC