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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.115 by root, Sun May 4 19:14:23 2008 UTC

  * You should have received a copy of 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>
  */
-/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
-   sub/add_weight will transcend the environment updating the carrying
-   variable. */
 #include <global.h>
 #include <loader.h>
 #include <sproto.h>
   if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
     {
       LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
       object *tmp = get_archetype_by_object_name (slaying);
       insert_ob_in_ob (tmp, this);
-      randomitems = NULL;   /* So another spell isn't created for this object */
+      randomitems = 0;   /* So another spell isn't created for this object */
       /* without this, value is all screwed up */
       value = arch->value * inv->value;
     }
   if (QUERY_FLAG (this, FLAG_MONSTER))
 bool
 object::parse_kv (object_thawer &f)
 {
   object *op_inv = inv;
+  key_value *last_kv = key_values;
   for (;;)
     {
       switch (f.kw)
         {
             f.next ();
             return true;
           case KW_ERROR:
-            set_ob_key_value (this, f.kw_str, f.value, true);
+            // append as key value pair (do not use kv_set as it prepends)
+            // we also do not even try to find old values, duplicate keys stay duplicate
+            {
+              key_value *kv = new key_value;
+              kv->next  = 0;
+              kv->key   = shstr (f.kw_str);
+              kv->value = shstr (f.value);
+              if (!last_kv)
+                key_values = last_kv = kv;
+              else
+                {
+                  while (last_kv->next)
+                    last_kv = last_kv->next;
+                  last_kv->next = kv;
+                  last_kv       = kv;
+                }
+            }
             //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
             break;
           default:
             if (!f.parse_error ("object", name))
   assert (arch); //D maybe use exception handling of sorts?
   f.next ();
-  object *op = object::create ();
+  object *op = arch->instance ();
   op->map = map;
-  arch->copy_to (op);
-  // copy_to activates, this should be fixed properly
+  // instance() activates, this should be fixed properly
   op->deactivate ();
   if (!op->parse_kv (f))
     {
       op->destroy (true);
     /* 110 */
     KW_destroy_on_death,
     KW_NULL,
   };
-  int i;
   /* This saves the key/value lists.  We do it first so that any
    * keys that match field names will be overwritten by the loader.
    */
-  for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
+  for (key_value *kv = op->key_values; kv; kv = kv->next)
-    {
+    if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
-      /* Find the field in the opposing member. */
+      f.put (kv->key, kv->value);
-      key_value *arch_field = get_ob_key_link (tmp, my_field->key);
-      /* If there's no partnering field, or it's got a different value, save our field. */
-      if (!arch_field || my_field->value != arch_field->value)
-        f.put (my_field->key, my_field->value);
-    }
   /* We don't need to worry about the arch's extra fields - they
    * will get taken care of the copy_to method.
    */
   CMP_OUT (name);
   CMP_OUT (name_pl);
   CMP_OUT (custom_name);
   CMP_OUT (title);
   CMP_OUT (race);
+  CMP_OUT (skill);
   CMP_OUT (slaying);
   CMP_OUT (tag);
   CMP_OUT (other_arch);
   if (op->msg  != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
   CMP_OUT (direction);
   CMP_OUT (type);
   CMP_OUT (subtype);
   CMP_OUT (attacktype);
-  for (i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < NROFATTACKS; i++)
     if (expect_false (op->resist[i] != tmp->resist[i]))
       f.put (resist_save[i], op->resist[i]);
   CMP_OUT (path_attuned);
   CMP_OUT (path_repelled);
   CMP_OUT (last_sp);
   CMP_OUT (last_grace);
   CMP_OUT (last_eat);
   CMP_OUT (glow_radius);
-  if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op)))
+  if (op->flag [FLAG_IS_LINKED])
+    if (int i = get_button_value (op))
-    f.put (KW_connected, i);
+      f.put (KW_connected, i);
   CMP_OUT (randomitems);
   CMP_OUT2 (container, weight_limit);
   CMP_OUT (run_away);
   CMP_OUT (move_off);
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
   if (op->flag != tmp->flag)
-    for (i = 0; i <= NUM_FLAGS; i++)
+    for (int i = 0; i <= NUM_FLAGS; i++)
       if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
         f.put (flag_names [i], op->flag [i] ? "1" : "0");
   // save body locations
-  for (i = 0; i < NUM_BODY_LOCATIONS; i++)
+  for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
     if (expect_false (op->slot[i].info != tmp->slot[i].info))
       f.put (body_locations[i].save_name, op->slot[i].info);
 }
 /*

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC vs. Revision 1.115 by root, Sun May 4 19:14:23 2008 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.115 by root, Sun May 4 19:14:23 2008 UTC