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.191 by root, Sun Sep 30 20:22:15 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC

305 { 305 {
306 ob1->optimise (); 306 ob1->optimise ();
307 ob2->optimise (); 307 ob2->optimise ();
308 308
309 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2)) 310 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
313
314 if (k1 != k2)
311 return 0; 315 return 0;
316 else if (k1 == 0)
317 return 1;
318 else if (!cfperl_can_merge (ob1, ob2))
319 return 0;
320 }
312 } 321 }
313 322
314 /* Everything passes, must be OK. */ 323 /* Everything passes, must be OK. */
315 return 1; 324 return 1;
316} 325}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines