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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.341 by root, Fri Feb 25 07:23:38 2011 UTC vs.
Revision 1.342 by sf-kernelpanic, Sun Apr 10 20:30:53 2011 UTC

… …
274 */ 274 */
275bool object::can_merge_slow (object *ob1, object *ob2) 275bool object::can_merge_slow (object *ob1, object *ob2)
276{ 276{
277 /* A couple quick sanity checks */ 277 /* A couple quick sanity checks */
278 if (ob1 == ob2 278 if (ob1 == ob2
279 || ob1->type != ob2->type 279 || ob1->type != ob2->type
280 || ob1->value != ob2->value 280 || ob1->value != ob2->value
281 || ob1->name != ob2->name 281 || ob1->name != ob2->name
282 || ob1->custom_name != ob2->custom_name
282 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) 283 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
283 return 0; 284 return 0;
284 285
285 /* Do not merge objects if nrof would overflow, assume nrof 286 /* Do not merge objects if nrof would overflow, assume nrof
286 * is always 0 .. 2**31-1 */ 287 * is always 0 .. 2**31-1 */

Diff Legend

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