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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.164 by root, Fri Oct 16 01:19:12 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 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
  * by the caller.
  */
 int
 blocked_link (object *ob, maptile *m, int sx, int sy)
 {
-  object *tmp;
-  int mflags, blocked;
   /* Make sure the coordinates are valid - they should be, as caller should
    * have already checked this.
    */
   if (OUT_OF_REAL_MAP (m, sx, sy))
     {
     }
   /* Save some cycles - instead of calling get_map_flags(), just get the value
    * directly.
    */
-  mflags = m->at (sx, sy).flags ();
+  mapspace &ms = m->at (sx, sy);
-  blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
+  int mflags  = ms.flags ();
+  int blocked = ms.move_block;
   /* If space is currently not blocked by anything, no need to
    * go further.  Not true for players - all sorts of special
    * things we need to do for players.
    */
   if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
     return 0;
-  /* if there isn't anytyhing alive on this space, and this space isn't
+  /* if there isn't anything alive on this space, and this space isn't
    * otherwise blocked, we can return now.  Only if there is a living
    * creature do we need to investigate if it is part of this creature
    * or another.  Likewise, only if something is blocking us do we
    * need to investigate if there is a special circumstance that would
    * let the player through (inventory checkers for example)
   /* We basically go through the stack of objects, and if there is
    * some other object that has NO_PASS or FLAG_ALIVE set, return
    * true.  If we get through the entire stack, that must mean
    * ob is blocking it, so return 0.
    */
-  for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
+  for (object *tmp = ms.bot; tmp; tmp = tmp->above)
     {
+      bool block = OB_MOVE_BLOCK (ob, tmp);
       /* This must be before the checks below.  Code for inventory checkers. */
-      if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
+      if (block && tmp->type == CHECK_INV)
         {
+          bool have = check_inv_recursive (ob, tmp);
           /* If last_sp is set, the player/monster needs an object,
            * so we check for it.  If they don't have it, they can't
            * pass through this space.
            */
           if (tmp->last_sp)
             {
-              if (check_inv_recursive (ob, tmp) == NULL)
+              if (!have)
                 return 1;
-              else
-                continue;
             }
           else
             {
               /* In this case, the player must not have the object -
                * if they do, they can't pass through.
                */
-              if (check_inv_recursive (ob, tmp) != NULL)        /* player has object */
+              if (have)
                 return 1;
-              else
-                continue;
             }
-        }                       /* if check_inv */
+        }
+      else if (block && tmp->type == T_MATCH)
+        {
+          //TODO
+        }
       else
         {
           /* Broke apart a big nasty if into several here to make
            * this more readable.  first check - if the space blocks
            * movement, can't move here.
            * second - if a monster, can't move there, unless it is a
-           * hidden dm
+           * dm.
            */
-          if (OB_MOVE_BLOCK (ob, tmp))
+          if (block)
             return 1;
           if (tmp->flag [FLAG_ALIVE]
               && tmp->head_ () != ob
               && tmp != ob
               && tmp->type != DOOR
-              && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
+              && !tmp->flag [FLAG_WIZ])
             return 1;
         }
     }
   return 0;
 }
 /*
  * Returns qthe blocking object if the given object can't fit in the given
   return items;
 }
 /* opposite of parse string, this puts the string that was originally fed in to
  * the map (or something equivilent) into output_string. */
-static void
+static const char *
-print_shop_string (maptile *m, char *output_string)
+print_shop_string (maptile *m)
 {
-  int i;
+  static dynbuf_text buf; buf.clear ();
-  char tmp[MAX_BUF];
-  strcpy (output_string, "");
-  for (i = 0; i < m->shopitems[0].index; i++)
+  for (int i = 0; i < m->shopitems[0].index; i++)
     {
       if (m->shopitems[i].typenum)
         {
           if (m->shopitems[i].strength)
-            sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
+            buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
           else
-            sprintf (tmp, "%s;", m->shopitems[i].name);
+            buf.printf ("%s;", m->shopitems[i].name);
         }
       else
         {
           if (m->shopitems[i].strength)
-            sprintf (tmp, "*:%d;", m->shopitems[i].strength);
+            buf.printf ("*:%d;", m->shopitems[i].strength);
           else
-            sprintf (tmp, "*");
+            buf.printf ("*");
         }
-      strcat (output_string, tmp);
     }
+  return buf;
 }
 /* This loads the header information of the map.  The header
  * contains things like difficulty, size, timeout, etc.
  * this used to be stored in the map object, but with the
   MAP_OUT (reset_timeout);
   MAP_OUT (fixed_resettime);
   MAP_OUT (no_reset);
   MAP_OUT (no_drop);
   MAP_OUT (difficulty);
   if (default_region) MAP_OUT2 (region, default_region->name);
-  if (shopitems)
+  if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
-    {
-      char shop[MAX_BUF];
-      print_shop_string (this, shop);
-      MAP_OUT2 (shopitems, shop);
-    }
   MAP_OUT (shopgreed);
   MAP_OUT (shopmin);
   MAP_OUT (shopmax);
   if (shoprace) MAP_OUT (shoprace);
   MAP_OUT (darkness);
   MAP_OUT (width);
   MAP_OUT (height);
   MAP_OUT (enter_x);
   MAP_OUT (enter_y);

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.164 by root, Fri Oct 16 01:19:12 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.164 by root, Fri Oct 16 01:19:12 2009 UTC