| … | |
… | |
| 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; |
| … | |
… | |
| 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 | { |
| … | |
… | |
| 1952 | * activate recursively a flag on an object inventory |
1952 | * activate recursively a flag on an object inventory |
| 1953 | */ |
1953 | */ |
| 1954 | void |
1954 | void |
| 1955 | flag_inv (object *op, int flag) |
1955 | flag_inv (object *op, int flag) |
| 1956 | { |
1956 | { |
| 1957 | if (op->inv) |
|
|
| 1958 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1957 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1959 | { |
1958 | { |
| 1960 | SET_FLAG (tmp, flag); |
1959 | SET_FLAG (tmp, flag); |
| 1961 | flag_inv (tmp, flag); |
1960 | flag_inv (tmp, flag); |
| 1962 | } |
1961 | } |
| 1963 | } |
1962 | } |
| 1964 | |
1963 | |
| 1965 | /* |
1964 | /* |
| 1966 | * deactivate recursively a flag on an object inventory |
1965 | * deactivate recursively a flag on an object inventory |
| 1967 | */ |
1966 | */ |
| 1968 | void |
1967 | void |
| 1969 | unflag_inv (object *op, int flag) |
1968 | unflag_inv (object *op, int flag) |
| 1970 | { |
1969 | { |
| 1971 | if (op->inv) |
|
|
| 1972 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1970 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1973 | { |
1971 | { |
| 1974 | CLEAR_FLAG (tmp, flag); |
1972 | CLEAR_FLAG (tmp, flag); |
| 1975 | unflag_inv (tmp, flag); |
1973 | unflag_inv (tmp, flag); |
| 1976 | } |
1974 | } |
| 1977 | } |
1975 | } |
| 1978 | |
1976 | |
| 1979 | /* |
1977 | /* |
| 1980 | * find_free_spot(object, map, x, y, start, stop) will search for |
1978 | * 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 |
1979 | * a spot at the given map and coordinates which will be able to contain |
| … | |
… | |
| 1983 | * to search (see the freearr_x/y[] definition). |
1981 | * to search (see the freearr_x/y[] definition). |
| 1984 | * It returns a random choice among the alternatives found. |
1982 | * 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 |
1983 | * 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 |
1984 | * 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) |
1985 | * 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 |
1986 | * Note: This function does correctly handle tiled maps, but does not |
| 1992 | * inform the caller. However, insert_ob_in_map will update as |
1987 | * inform the caller. However, insert_ob_in_map will update as |
| 1993 | * necessary, so the caller shouldn't need to do any special work. |
1988 | * 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 |
1989 | * 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 |
1990 | * 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 |
1991 | * to know if the space in question will block the object. We can't use |
| … | |
… | |
| 2041 | |
2036 | |
| 2042 | /* Note it is intentional that we check ob - the movement type of the |
2037 | /* Note it is intentional that we check ob - the movement type of the |
| 2043 | * head of the object should correspond for the entire object. |
2038 | * head of the object should correspond for the entire object. |
| 2044 | */ |
2039 | */ |
| 2045 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2040 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2041 | continue; |
|
|
2042 | |
|
|
2043 | if (ob->blocked (m, pos.x, pos.y)) |
| 2046 | continue; |
2044 | continue; |
| 2047 | |
2045 | |
| 2048 | altern [index++] = i; |
2046 | altern [index++] = i; |
| 2049 | } |
2047 | } |
| 2050 | |
2048 | |
