ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.51 by root, Wed Dec 13 03:28:42 2006 UTC vs.
Revision 1.53 by root, Wed Dec 13 18:08:01 2006 UTC

… …
59}; 59};
60 60
61struct UUID 61struct UUID
62{ 62{
63 uint64 seq; 63 uint64 seq;
64
65 UUID () { }
66 UUID (uint64 seq) : seq(seq) { }
67 operator uint64() { return seq; }
68 void operator =(uint64 seq) { this->seq = seq; }
64}; 69};
65 70
66extern void init_uuid (); 71extern void init_uuid ();
67extern UUID gen_uuid (); 72extern UUID gen_uuid ();
68extern const uint64 UUID_SKIP; 73extern const uint64 UUID_SKIP;
… …
255 static bool can_merge_slow (object *op1, object *op2); 260 static bool can_merge_slow (object *op1, object *op2);
256 261
257 // this is often used in time-critical code, so optimise 262 // this is often used in time-critical code, so optimise
258 static bool can_merge (object *op1, object *op2) 263 static bool can_merge (object *op1, object *op2)
259 { 264 {
260 return op1->value != op2->value 265 return op1->value == op2->value
261 && op1->name != op2->name 266 && op1->name == op2->name
262 && can_merge_slow (op1, op2); 267 && can_merge_slow (op1, op2);
263 } 268 }
264 269
265 void clear (); 270 void clear ();
266 271

Diff Legend

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