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.52 by root, Wed Dec 13 03:29:45 2006 UTC

255 static bool can_merge_slow (object *op1, object *op2); 255 static bool can_merge_slow (object *op1, object *op2);
256 256
257 // this is often used in time-critical code, so optimise 257 // this is often used in time-critical code, so optimise
258 static bool can_merge (object *op1, object *op2) 258 static bool can_merge (object *op1, object *op2)
259 { 259 {
260 return op1->value != op2->value 260 return op1->value == op2->value
261 && op1->name != op2->name 261 && op1->name == op2->name
262 && can_merge_slow (op1, op2); 262 && can_merge_slow (op1, op2);
263 } 263 }
264 264
265 void clear (); 265 void clear ();
266 266

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines