1 | /* |
1 | /* |
2 | * static char *rcsid_object_c = |
2 | * static char *rcsid_object_c = |
3 | * "$Id: object.c,v 1.7 2006/06/23 18:30:22 root Exp $"; |
3 | * "$Id: object.c,v 1.8 2006/08/11 12:50:36 elmex Exp $"; |
4 | */ |
4 | */ |
5 | |
5 | |
6 | /* |
6 | /* |
7 | CrossFire, A Multiplayer game for X-windows |
7 | CrossFire, A Multiplayer game for X-windows |
8 | |
8 | |
… | |
… | |
1601 | */ |
1601 | */ |
1602 | |
1602 | |
1603 | while (top != NULL) { |
1603 | while (top != NULL) { |
1604 | if (QUERY_FLAG(top, FLAG_IS_FLOOR) || |
1604 | if (QUERY_FLAG(top, FLAG_IS_FLOOR) || |
1605 | QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; |
1605 | QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; |
1606 | if (QUERY_FLAG(top, FLAG_NO_PICK) && |
1606 | if (QUERY_FLAG(top, FLAG_NO_PICK) |
1607 | (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))) { |
1607 | && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) |
|
|
1608 | && !QUERY_FLAG(top, FLAG_IS_FLOOR)) |
|
|
1609 | { |
1608 | /* We insert above top, so we want this object below this */ |
1610 | /* We insert above top, so we want this object below this */ |
1609 | top=top->below; |
1611 | top=top->below; |
1610 | break; |
1612 | break; |
1611 | } |
1613 | } |
|
|
1614 | |
1612 | last = top; |
1615 | last = top; |
1613 | top = top->above; |
1616 | top = top->above; |
1614 | } |
1617 | } |
1615 | /* Don't want top to be NULL, so set it to the last valid object */ |
1618 | /* Don't want top to be NULL, so set it to the last valid object */ |
1616 | top = last; |
1619 | top = last; |