[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.51 by root, Wed Dec 13 03:28:42 2006 UTC vs.
Revision 1.55 by root, Fri Dec 15 20:08:45 2006 UTC

     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 #ifndef OBJECT_H
 #define OBJECT_H
 };
 struct UUID
 {
   uint64 seq;
+  UUID () { }
+  UUID (uint64 seq) : seq(seq) { }
+  operator uint64() { return seq; }
+  void operator =(uint64 seq) { this->seq = seq; }
 };
 extern void init_uuid ();
 extern UUID gen_uuid ();
 extern const uint64 UUID_SKIP;
   static bool can_merge_slow (object *op1, object *op2);
   // this is often used in time-critical code, so optimise
   static bool can_merge (object *op1, object *op2)
   {
-    return op1->value != op2->value
+    return op1->value == op2->value
-        && op1->name  != op2->name
+        && op1->name  == op2->name
         && can_merge_slow (op1, op2);
   }
   void clear ();

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