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.245 by root, Sun May 18 19:53:07 2008 UTC vs.
Revision 1.246 by root, Thu May 22 15:37:44 2008 UTC

184 if (ob1 == ob2 184 if (ob1 == ob2
185 || ob1->type != ob2->type 185 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
187 || ob1->value != ob2->value 187 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
189 return 0;
190
191 // some objects are unmergable
192 if (!ob1->nrof || !ob2->nrof)
193 return 0; 189 return 0;
194 190
195 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow. First part checks
196 * for unsigned overflow (2c), second part checks whether the result 192 * for unsigned overflow (2c), second part checks whether the result
197 * would fit into a 32 bit signed int, which is often used to hold 193 * would fit into a 32 bit signed int, which is often used to hold

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines