| version 1.93 | | version 1.94 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.93 2004/11/25 18:26:53 ryo_saeba Exp $"; | | * "$Id: object.c,v 1.94 2005/01/24 07:29:24 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| * check weight | | * check weight |
| */ | | */ |
| | | |
| inline int CAN_MERGE(object *ob1, object *ob2) { | | int CAN_MERGE(object *ob1, object *ob2) { |
| | | |
| /* A couple quicksanity checks */ | | /* A couple quicksanity checks */ |
| if ((ob1 == ob2) || (ob1->type != ob2->type)) return 0; | | if ((ob1 == ob2) || (ob1->type != ob2->type)) return 0; |
| | |
| (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && | | (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && |
| (op->face && !op->face->visibility)) { | | (op->face && !op->face->visibility)) { |
| for (last=top; last != floor; last=last->below) | | for (last=top; last != floor; last=last->below) |
| if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != 66)) break; | | if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; |
| /* Check to see i we found the object that blocks view, | | /* Check to see i we found the object that blocks view, |
| * and make sure we have a below pointer for it so that | | * and make sure we have a below pointer for it so that |
| * we can get inserted below this one, which requires we | | * we can get inserted below this one, which requires we |