--- deliantra/server/common/object.C	2008/08/17 22:46:26	1.253
+++ deliantra/server/common/object.C	2008/09/16 16:03:02	1.257
@@ -188,12 +188,9 @@
       || ob1->name  != ob2->name)
     return 0;
 
-  /* Do not merge objects if nrof would overflow. First part checks
-   * for unsigned overflow (2c), second part checks whether the result
-   * would fit into a 32 bit signed int, which is often used to hold
-   * nrof values.
-   */
-  if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
+  /* Do not merge objects if nrof would overflow, assume nrof
+   * is always 0 .. 2**31-1 */
+  if (ob1->nrof > 0x7fffffff - ob2->nrof)
     return 0;
 
   /* If the objects have been identified, set the BEEN_APPLIED flag.
@@ -237,7 +234,6 @@
 
   if ((ob1->flag ^ ob2->flag)
       .reset (FLAG_INV_LOCKED)
-      .reset (FLAG_CLIENT_SENT)
       .reset (FLAG_REMOVED)
       .any ())
     return 0;
@@ -642,7 +638,7 @@
   if (speed < 0)
     dst->speed_left -= rndm ();
 
-  dst->set_speed (dst->speed);
+  dst->activate ();
 }
 
 void
@@ -836,6 +832,9 @@
   if (active)
     return;
 
+  if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
+  if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
+
   if (has_active_speed ())
     actives.insert (this);
 }