| version 1.64 | | version 1.65 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_map_c = | | * static char *rcsid_map_c = |
| * "$Id: map.c,v 1.64 2004/04/16 06:23:41 mwedel Exp $"; | | * "$Id: map.c,v 1.65 2004/08/18 06:29:24 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); | | insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
| else | | else |
| insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP); | | insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP); |
| if (op->inv) sum_weight(op); | | if (op->inv) { |
| | | object *invop, *next; |
| | | |
| | | /* Clear out any objects without archetypes, as they will just cause |
| | | * crashes later on. |
| | | */ |
| | | for (invop = op->inv; invop; invop=next) { |
| | | next = invop->above; |
| | | if (!invop->arch) { |
| | | LOG(llevDebug,"Discarding object without arch: %s\n", invop->name?invop->name:"(null)"); |
| | | remove_ob(invop); |
| | | free_object(invop); |
| | | } |
| | | } |
| | | sum_weight(op); |
| | | } |
| prev=op,last_more=op; | | prev=op,last_more=op; |
| break; | | break; |
| | | |