… | … | ||
---|---|---|---|
1150 | merge_ob (object *op, object *top) | 1150 | merge_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 | { |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |