--- deliantra/server/common/object.C	2006/09/10 00:51:23	1.22
+++ deliantra/server/common/object.C	2006/09/10 14:54:02	1.23
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_object_c =
- *   "$Id: object.C,v 1.22 2006/09/10 00:51:23 root Exp $";
+ *   "$Id: object.C,v 1.23 2006/09/10 14:54:02 root Exp $";
  */
 
 /*
@@ -531,8 +531,8 @@
 
 void object::clone (object *destination)
 {
-  *(object_copy *)destination = *(object_copy *)this;
-  *(object_pod  *)destination = *(object_pod  *)this;
+  *(object_copy *)destination = *this;
+  *(object_pod  *)destination = *this;
 
   if (self || cb)
     INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
@@ -592,23 +592,23 @@
     op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
 
   /* Copy over key_values, if any. */
-  if (op2->key_values != NULL)
+  if (op2->key_values)
     {
-      key_value *tail = NULL;
+      key_value *tail = 0;
       key_value *i;
 
-      op->key_values = NULL;
+      op->key_values = 0;
 
-      for (i = op2->key_values; i != NULL; i = i->next)
+      for (i = op2->key_values; i; i = i->next)
         {
           key_value *new_link = new key_value;
 
-          new_link->next  = NULL;
+          new_link->next  = 0;
           new_link->key   = i->key;
           new_link->value = i->value;
 
           /* Try and be clever here, too. */
-          if (op->key_values == NULL)
+          if (!op->key_values)
             {
               op->key_values = new_link;
               tail = new_link;