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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 <global.h>
 static const uint64 UUID_GAP = 1<<19;
 uint32_t mapspace::smellcount = 10000;
 objectvec objects;
 activevec actives;
+//+GPL
 short freearr_x[SIZEOFFREE] = {
    0,
    0,  1,  1,  1,  0, -1, -1, -1,
    0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2, -2, -2, -2, -1,
    0,
   -1, -1,  0,  1,  1,  1,  0, -1,
   -2, -2, -2, -1,  0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2,
   -3, -3, -3, -3, -2, -1,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3
 };
-int maxfree[SIZEOFFREE] = {
-   0,
-   9, 10, 13, 14, 17, 18, 21, 22,
-  25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
-  49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
-};
 int freedir[SIZEOFFREE] = {
    0,
    1,  2,  3,  4,  5,  6,  7,  8,
    1,  2,  2,  2,  3,  4,  4,  4,  5,  6,  6,  6,  7,  8,  8,  8,
    1,  2,  2,  2,  2,  2,  3,  4,  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8,  8,  8
+};
+static int maxfree[SIZEOFFREE] = {
+   0,
+   9, 10, 13, 14, 17, 18, 21, 22,
+  25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
+  49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
 };
 static void
 write_uuid (uval64 skip, bool sync)
 {
 bool object::can_merge_slow (object *ob1, object *ob2)
 {
   /* A couple quicksanity checks */
   if (ob1 == ob2
       || ob1->type  != ob2->type
-      || ob1->speed != ob2->speed
+      || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
       || ob1->value != ob2->value
       || ob1->name  != ob2->name)
     return 0;
   /* Do not merge objects if nrof would overflow, assume nrof
       || ob1->move_block   != ob2->move_block
       || ob1->move_allow   != ob2->move_allow
       || ob1->move_on      != ob2->move_on
       || ob1->move_off     != ob2->move_off
       || ob1->move_slow    != ob2->move_slow
-      || ob1->move_slow_penalty != ob2->move_slow_penalty
+      || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
       || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
       || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
     return 0;
   if ((ob1->flag ^ ob2->flag)
           // the player itself is always on a map, so we will find him here
           // even if our inv is in a player.
           if (envest->is_on_map ())
             if (object *pl = envest->ms ().player ())
-              if (pl->container == env)
+              if (pl->container_ () == env)
                 return pl;
         }
       else
         {
           // maybe there is a player standing on the same mapspace
           // this will catch the case where "this" is a player
           if (object *pl = ms ().player ())
-            if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
+            if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
-                || this == pl->container)
+                || pl->container_ () == this)
               return pl;
         }
     }
   return 0;
   object_freezer freezer;
   op->write (freezer);
   return freezer.as_string ();
 }
-/*
+char *
- * get_nearest_part(multi-object, object 2) returns the part of the
+object::as_string ()
- * multi-object 1 which is closest to the second object.
- * If it's not a multi-object, it is returned.
- */
-object *
-get_nearest_part (object *op, const object *pl)
 {
-  object *tmp, *closest;
+  return dump_object (this);
-  int last_dist, i;
-  if (!op->more)
-    return op;
-  for (last_dist = distance (op, pl), closest = op, tmp = op->more;
-       tmp;
-       tmp = tmp->more)
-    if ((i = distance (tmp, pl)) < last_dist)
-      closest = tmp, last_dist = i;
-  return closest;
 }
 /*
  * Returns the object which has the count-variable equal to the argument.
  * VERRRY slow.
             update_stats ();
             new_draw_info_format (NDI_UNIQUE, 0, this,
                                   "You try to balance all your items at once, "
                                   "but the %s is just too much for your body. "
-                                  "[You need to unapply some items first.]", &ob->name);
+                                  "[You need to unapply some items first - use the 'body' command to see "
+                                  "how many items you cna wera on a specific body part.]", &ob->name);
             return false;
           }
       //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
     }
  * This function needs to be called whenever the speed of an object changes.
  */
 void
 object::set_speed (float speed)
 {
-  if (flag [FLAG_FREED] && speed)
-    {
-      LOG (llevError, "Object %s is freed but has speed.\n", &name);
-      speed = 0;
-    }
   this->speed = speed;
   if (has_active_speed ())
     activate ();
   else
   if (!(m.flags_ & P_UPTODATE))
     /* nop */;
   else if (action == UP_OBJ_INSERT)
     {
+#if 0
       // this is likely overkill, TODO: revisit (schmorp)
       if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW)  && !(m.flags_ & P_BLOCKSVIEW))
           || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
           || (op->is_player ()               && !(m.flags_ & P_PLAYER))
           || (op->type == SAFE_GROUND        && !(m.flags_ & P_SAFE))
           || (m.move_slow | op->move_slow) != m.move_slow
           /* This isn't perfect, but I don't expect a lot of objects to
            * have move_allow right now.
            */
           || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
-          || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
         m.invalidate ();
+#else
+      // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
+      m.invalidate ();
+#endif
     }
     /* if the object is being removed, we can't make intelligent
      * decisions, because remove_ob can't really pass the object
      * that is being removed.
      */
  *   the previous environment.
  */
 void
 object::do_remove ()
 {
-  object *tmp, *last = 0;
-  object *otmp;
   if (flag [FLAG_REMOVED])
     return;
   INVOKE_OBJECT (REMOVE, this);
                 close_container ();
               --map->players;
               map->touch ();
             }
-          else if (pl->container == this)
+          else if (pl->container_ () == this)
             {
               // removing a container should close it
               close_container ();
             }
       int check_walk_off = !flag [FLAG_NO_APPLY];
       if (object *pl = ms.player ())
         {
-          if (pl->container == this)
+          if (pl->container_ () == this)
             /* If a container that the player is currently using somehow gets
              * removed (most likely destroyed), update the player view
              * appropriately.
              */
             pl->close_container ();
           //TODO: update floorbox to preserve ordering
           if (pl->contr->ns)
             pl->contr->ns->floorbox_update ();
         }
+      if (check_walk_off)
-      for (tmp = ms.bot; tmp; tmp = tmp->above)
+        for (object *above, *tmp = ms.bot; tmp; tmp = above)
-        {
+          {
+            above = tmp->above;
-          /* No point updating the players look faces if he is the object
+            /* No point updating the players look faces if he is the object
-           * being removed.
+             * being removed.
-           */
+             */
-          /* See if object moving off should effect something */
+            /* See if object moving off should effect something */
-          if (check_walk_off
-              && ((move_type & tmp->move_off)
+            if ((move_type & tmp->move_off)
-                  && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
+                && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
-            {
               move_apply (tmp, this, 0);
-              if (destroyed ())
-                LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
-            }
+          }
-          last = tmp;
-        }
       if (affects_los ())
         update_all_los (map, x, y);
     }
 }
  * This basically means that if direction is 15, then it could either go
  * direction 4, 14, or 16 to get back to where we are.
  * Moved from spell_util.c to object.c with the other related direction
  * functions.
  */
-const int reduction_dir[SIZEOFFREE][3] = {
+static const int reduction_dir[SIZEOFFREE][3] = {
   {0, 0, 0},                    /* 0 */
   {0, 0, 0},                    /* 1 */
   {0, 0, 0},                    /* 2 */
   {0, 0, 0},                    /* 3 */
   {0, 0, 0},                    /* 4 */
       return splay (tmp);
   return 0;
 }
+//-GPL
+void
+object::force_set_timer (int duration)
+{
+  this->duration   = 1;
+  this->speed_left = -1.f;
+  this->set_speed (duration ? 1.f / duration : 0.f);
+}
 object *
 object::force_add (shstr_tmp name, int duration)
 {
   if (object *force = force_find (name))
     force->destroy ();
   object *force = get_archetype (FORCE_NAME);
-  force->slaying    = name;
+  force->slaying = name;
-  force->stats.food = 1;
+  force->force_set_timer (duration);
-  force->speed_left = -1.f;
-  force->set_speed (duration ? 1.f / duration : 0.f);
-  force->flag [FLAG_IS_USED_UP] = true;
-  force->flag [FLAG_APPLIED]    = true;
+  force->flag [FLAG_APPLIED] = true;
   return insert (force);
 }
 void

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC vs. Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC