… | |
… | |
307 | ob1->optimise (); |
307 | ob1->optimise (); |
308 | ob2->optimise (); |
308 | ob2->optimise (); |
309 | |
309 | |
310 | if (ob1->self || ob2->self) |
310 | if (ob1->self || ob2->self) |
311 | { |
311 | { |
312 | int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; |
312 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
313 | int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; |
313 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
314 | |
314 | |
315 | if (k1 != k2) |
315 | if (k1 != k2) |
316 | return 0; |
316 | return 0; |
317 | else if (k1 == 0) |
317 | else if (k1 == 0) |
318 | return 1; |
318 | return 1; |
… | |
… | |
447 | { |
447 | { |
448 | // allow objects which own objects |
448 | // allow objects which own objects |
449 | if (owner) |
449 | if (owner) |
450 | while (owner->owner) |
450 | while (owner->owner) |
451 | owner = owner->owner; |
451 | owner = owner->owner; |
|
|
452 | |
|
|
453 | if (flag [FLAG_FREED]) |
|
|
454 | { |
|
|
455 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
456 | return; |
|
|
457 | } |
452 | |
458 | |
453 | this->owner = owner; |
459 | this->owner = owner; |
454 | } |
460 | } |
455 | |
461 | |
456 | int |
462 | int |
… | |
… | |
1150 | merge_ob (object *op, object *top) |
1156 | merge_ob (object *op, object *top) |
1151 | { |
1157 | { |
1152 | if (!op->nrof) |
1158 | if (!op->nrof) |
1153 | return 0; |
1159 | return 0; |
1154 | |
1160 | |
1155 | if (top) |
1161 | if (!top) |
1156 | for (top = op; top && top->above; top = top->above) |
1162 | for (top = op; top && top->above; top = top->above) |
1157 | ; |
1163 | ; |
1158 | |
1164 | |
1159 | for (; top; top = top->below) |
1165 | for (; top; top = top->below) |
1160 | { |
1166 | { |
… | |
… | |
1952 | * activate recursively a flag on an object inventory |
1958 | * activate recursively a flag on an object inventory |
1953 | */ |
1959 | */ |
1954 | void |
1960 | void |
1955 | flag_inv (object *op, int flag) |
1961 | flag_inv (object *op, int flag) |
1956 | { |
1962 | { |
1957 | if (op->inv) |
|
|
1958 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1963 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1959 | { |
1964 | { |
1960 | SET_FLAG (tmp, flag); |
1965 | SET_FLAG (tmp, flag); |
1961 | flag_inv (tmp, flag); |
1966 | flag_inv (tmp, flag); |
1962 | } |
1967 | } |
1963 | } |
1968 | } |
1964 | |
1969 | |
1965 | /* |
1970 | /* |
1966 | * deactivate recursively a flag on an object inventory |
1971 | * deactivate recursively a flag on an object inventory |
1967 | */ |
1972 | */ |
1968 | void |
1973 | void |
1969 | unflag_inv (object *op, int flag) |
1974 | unflag_inv (object *op, int flag) |
1970 | { |
1975 | { |
1971 | if (op->inv) |
|
|
1972 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1976 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1973 | { |
1977 | { |
1974 | CLEAR_FLAG (tmp, flag); |
1978 | CLEAR_FLAG (tmp, flag); |
1975 | unflag_inv (tmp, flag); |
1979 | unflag_inv (tmp, flag); |
1976 | } |
1980 | } |
1977 | } |
1981 | } |
1978 | |
1982 | |
1979 | /* |
1983 | /* |
1980 | * find_free_spot(object, map, x, y, start, stop) will search for |
1984 | * find_free_spot(object, map, x, y, start, stop) will search for |
1981 | * a spot at the given map and coordinates which will be able to contain |
1985 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
1983 | * to search (see the freearr_x/y[] definition). |
1987 | * to search (see the freearr_x/y[] definition). |
1984 | * It returns a random choice among the alternatives found. |
1988 | * It returns a random choice among the alternatives found. |
1985 | * start and stop are where to start relative to the free_arr array (1,9 |
1989 | * start and stop are where to start relative to the free_arr array (1,9 |
1986 | * does all 4 immediate directions). This returns the index into the |
1990 | * does all 4 immediate directions). This returns the index into the |
1987 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1991 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1988 | * Note - this only checks to see if there is space for the head of the |
|
|
1989 | * object - if it is a multispace object, this should be called for all |
|
|
1990 | * pieces. |
|
|
1991 | * Note2: This function does correctly handle tiled maps, but does not |
1992 | * Note: This function does correctly handle tiled maps, but does not |
1992 | * inform the caller. However, insert_ob_in_map will update as |
1993 | * inform the caller. However, insert_ob_in_map will update as |
1993 | * necessary, so the caller shouldn't need to do any special work. |
1994 | * necessary, so the caller shouldn't need to do any special work. |
1994 | * Note - updated to take an object instead of archetype - this is necessary |
1995 | * Note - updated to take an object instead of archetype - this is necessary |
1995 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1996 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1996 | * to know if the space in question will block the object. We can't use |
1997 | * to know if the space in question will block the object. We can't use |
… | |
… | |
2041 | |
2042 | |
2042 | /* Note it is intentional that we check ob - the movement type of the |
2043 | /* Note it is intentional that we check ob - the movement type of the |
2043 | * head of the object should correspond for the entire object. |
2044 | * head of the object should correspond for the entire object. |
2044 | */ |
2045 | */ |
2045 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2046 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2047 | continue; |
|
|
2048 | |
|
|
2049 | if (ob->blocked (m, pos.x, pos.y)) |
2046 | continue; |
2050 | continue; |
2047 | |
2051 | |
2048 | altern [index++] = i; |
2052 | altern [index++] = i; |
2049 | } |
2053 | } |
2050 | |
2054 | |