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.193 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.194 by root, Tue Oct 16 00:30:24 2007 UTC

1150merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1151{ 1151{
1152 if (!op->nrof) 1152 if (!op->nrof)
1153 return 0; 1153 return 0;
1154 1154
1155 if (top) 1155 if (!top)
1156 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1157 ; 1157 ;
1158 1158
1159 for (; top; top = top->below) 1159 for (; top; top = top->below)
1160 { 1160 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines