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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.340 by root, Fri Jul 2 19:54:41 2010 UTC vs.
Revision 1.346 by root, Wed May 4 07:36:40 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 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
 /* Returns TRUE if every key_values in wants has a partner with the same value in has. */
 static bool
 compare_ob_value_lists_one (const object *wants, const object *has)
 {
-  /* n-squared behaviour (see kv_get), but I'm hoping both
+  /* n-squared behaviour (see kv.get), but I'm hoping both
    * objects with lists are rare, and lists stay short. If not, use a
    * different structure or at least keep the lists sorted...
    */
   /* For each field in wants, */
-  for (key_value *kv = wants->key_values; kv; kv = kv->next)
+  for (key_value *kv = wants->kv.first; kv; kv = kv->next)
-    if (has->kv_get (kv->key) != kv->value)
+    if (has->kv.get (kv->key) != kv->value)
       return false;
   /* If we get here, every field in wants has a matching field in has. */
   return true;
 }
  */
 bool object::can_merge_slow (object *ob1, object *ob2)
 {
   /* A couple quick sanity checks */
   if (ob1 == ob2
-      || ob1->type  != ob2->type
+      || ob1->type        != ob2->type
-      || ob1->value != ob2->value
+      || ob1->value       != ob2->value
-      || ob1->name  != ob2->name
+      || ob1->name        != ob2->name
+      || ob1->custom_name != ob2->custom_name
       || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
     return 0;
   /* Do not merge objects if nrof would overflow, assume nrof
    * is always 0 .. 2**31-1 */
         if (ob1->level != ob2->level)
           return 0;
         break;
     }
-  if (ob1->key_values || ob2->key_values)
+  if (!ob1->kv.empty () || !ob2->kv.empty ())
     {
       /* At least one of these has key_values. */
-      if ((!ob1->key_values) != (!ob2->key_values))
+      if (ob1->kv.empty () != ob2->kv.empty ())
         return 0; /* One has fields, but the other one doesn't. */
       if (!compare_ob_value_lists (ob1, ob2))
         return 0;
     }
     }
   this->owner = owner;
 }
-/* Zero the key_values on op, decrementing the shared-string
- * refcounts and freeing the links.
- */
-static void
-free_key_values (object *op)
-{
-  for (key_value *i = op->key_values; i; )
-    {
-      key_value *next = i->next;
-      delete i;
-      i = next;
-    }
-  op->key_values = 0;
-}
 /*
  * copy_to first frees everything allocated by the dst object,
  * and then copies the contents of itself into the second
  * object, allocating what needs to be allocated.  Basically, any
  * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
 void
 object::copy_to (object *dst)
 {
   dst->remove ();
   *(object_copy *)dst = *this;
+  // maybe move to object_copy?
+  dst->kv = kv;
   dst->flag [FLAG_REMOVED] = true;
-  /* Copy over key_values, if any. */
-  if (key_values)
-    {
-      key_value *tail = 0;
-      dst->key_values = 0;
-      for (key_value *i = key_values; i; i = i->next)
-        {
-          key_value *new_link = new key_value;
-          new_link->next  = 0;
-          new_link->key   = i->key;
-          new_link->value = i->value;
-          /* Try and be clever here, too. */
-          if (!dst->key_values)
-            {
-              dst->key_values = new_link;
-              tail = new_link;
-            }
-          else
-            {
-              tail->next = new_link;
-              tail = new_link;
-            }
-        }
-    }
   dst->activate ();
 }
 void
 object::instantiate ()
 {
   if (!uuid.seq) // HACK
     uuid = UUID::gen ();
-  // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+  // TODO: unclean state changes, should not be done in copy_to AND instantiate
   if (flag [FLAG_RANDOM_SPEED] && speed)
     speed_left = - speed - rndm (); // TODO animation
   else
     speed_left = -1.;
 object::~object ()
 {
   unlink ();
-  free_key_values (this);
+  kv.clear ();
 }
 void object::link ()
 {
   assert (!index);//D
    * if some form of movement is allowed, let objects
    * drop on that space.
    */
   if (!drop_to_ground
       || !map
-      || map->in_memory != MAP_ACTIVE
+      || !map->linkable ()
       || map->no_drop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         inv->destroy ();
       above = 0;
       below = 0;
       ms.invalidate ();
-      if (map->in_memory == MAP_SAVING)
-        return;
       int check_walk_off = !flag [FLAG_NO_APPLY];
       if (object *pl = ms.player ())
         {
 {
   op->remove ();
   if (m == &freed_map)//D TODO: remove soon
     {//D
-      LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
+      LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
     }//D
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
       return tmp;
   return 0;
 }
+/* Zero the key_values on op, decrementing the shared-string
+ * refcounts and freeing the links.
+ */
+void
+key_values::clear ()
+{
+  for (key_value *kvp = first; kvp; )
+    {
+      key_value *next = kvp->next;
+      delete kvp;
+      kvp = next;
+    }
+  first = 0;
+}
 shstr_tmp
-object::kv_get (shstr_tmp key) const
+key_values::get (shstr_tmp key) const
 {
-  for (key_value *kv = key_values; kv; kv = kv->next)
+  for (key_value *kv = first; kv; kv = kv->next)
     if (kv->key == key)
       return kv->value;
   return shstr ();
 }
 void
+key_values::add (shstr_tmp key, shstr_tmp value)
+{
+  key_value *kv = new key_value;
+  kv->next  = first;
+  kv->key   = key;
+  kv->value = value;
+  first = kv;
+}
+void
-object::kv_set (shstr_tmp key, shstr_tmp value)
+key_values::set (shstr_tmp key, shstr_tmp value)
 {
-  for (key_value *kv = key_values; kv; kv = kv->next)
+  for (key_value *kv = first; kv; kv = kv->next)
     if (kv->key == key)
       {
         kv->value = value;
         return;
       }
-  key_value *kv = new key_value;
+  add (key, value);
-  kv->next  = key_values;
-  kv->key   = key;
-  kv->value = value;
-  key_values = kv;
 }
 void
-object::kv_del (shstr_tmp key)
+key_values::del (shstr_tmp key)
 {
-  for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
+  for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
     if ((*kvp)->key == key)
       {
         key_value *kv = *kvp;
         *kvp = (*kvp)->next;
         delete kv;
         return;
       }
+}
+void
+key_values::reverse ()
+{
+  key_value *prev = 0;
+  key_value *head = first;
+  while (head)
+    {
+      key_value *node = head;
+      head = head->next;
+      node->next = prev;
+      prev = node;
+    }
+  first = prev;
+}
+key_values &
+key_values::operator =(const key_values &kv)
+{
+  clear ();
+  for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
+    add (kvp->key, kvp->value);
+  reverse ();
 }
 object::depth_iterator::depth_iterator (object *container)
 : iterator_base (container)
 {
 object::force_add (shstr_tmp name, int duration)
 {
   if (object *force = force_find (name))
     force->destroy ();
-  object *force = get_archetype (FORCE_NAME);
+  object *force = archetype::get (FORCE_NAME);
   force->slaying = name;
   force->force_set_timer (duration);
   force->flag [FLAG_APPLIED] = true;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.340 by root, Fri Jul 2 19:54:41 2010 UTC vs. Revision 1.346 by root, Wed May 4 07:36:40 2011 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.340 by root, Fri Jul 2 19:54:41 2010 UTC vs.
Revision 1.346 by root, Wed May 4 07:36:40 2011 UTC