| … | |
… | |
| 254 | /* This is really a spellbook check - really, we should |
254 | /* This is really a spellbook check - really, we should |
| 255 | * check all objects in the inventory. |
255 | * check all objects in the inventory. |
| 256 | */ |
256 | */ |
| 257 | if (ob1->inv || ob2->inv) |
257 | if (ob1->inv || ob2->inv) |
| 258 | { |
258 | { |
| 259 | /* if one object has inventory but the other doesn't, not equiv */ |
259 | if (!(ob1->inv && ob2->inv)) |
| 260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
260 | return 0; /* inventories differ in length */ |
| 261 | return 0; |
|
|
| 262 | |
261 | |
| 263 | /* Now check to see if the two inventory objects could merge */ |
262 | if (ob1->inv->below || ob2->inv->below) |
|
|
263 | return 0; /* more than one object in inv */ |
|
|
264 | |
| 264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | if (!object::can_merge (ob1->inv, ob2->inv)) |
| 265 | return 0; |
266 | return 0; /* inventory objexts differ */ |
| 266 | |
267 | |
| 267 | /* inventory ok - still need to check rest of this object to see |
268 | /* inventory ok - still need to check rest of this object to see |
| 268 | * if it is valid. |
269 | * if it is valid. |
| 269 | */ |
270 | */ |
| 270 | } |
271 | } |
| … | |
… | |
| 305 | { |
306 | { |
| 306 | ob1->optimise (); |
307 | ob1->optimise (); |
| 307 | ob2->optimise (); |
308 | ob2->optimise (); |
| 308 | |
309 | |
| 309 | if (ob1->self || ob2->self) |
310 | if (ob1->self || ob2->self) |
| 310 | if (!cfperl_can_merge (ob1, ob2)) |
311 | { |
|
|
312 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
313 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
314 | |
|
|
315 | if (k1 != k2) |
| 311 | return 0; |
316 | return 0; |
|
|
317 | else if (k1 == 0) |
|
|
318 | return 1; |
|
|
319 | else if (!cfperl_can_merge (ob1, ob2)) |
|
|
320 | return 0; |
|
|
321 | } |
| 312 | } |
322 | } |
| 313 | |
323 | |
| 314 | /* Everything passes, must be OK. */ |
324 | /* Everything passes, must be OK. */ |
| 315 | return 1; |
325 | return 1; |
| 316 | } |
326 | } |
| … | |
… | |
| 1140 | merge_ob (object *op, object *top) |
1150 | merge_ob (object *op, object *top) |
| 1141 | { |
1151 | { |
| 1142 | if (!op->nrof) |
1152 | if (!op->nrof) |
| 1143 | return 0; |
1153 | return 0; |
| 1144 | |
1154 | |
| 1145 | if (top) |
1155 | if (!top) |
| 1146 | for (top = op; top && top->above; top = top->above) |
1156 | for (top = op; top && top->above; top = top->above) |
| 1147 | ; |
1157 | ; |
| 1148 | |
1158 | |
| 1149 | for (; top; top = top->below) |
1159 | for (; top; top = top->below) |
| 1150 | { |
1160 | { |
| … | |
… | |
| 1942 | * activate recursively a flag on an object inventory |
1952 | * activate recursively a flag on an object inventory |
| 1943 | */ |
1953 | */ |
| 1944 | void |
1954 | void |
| 1945 | flag_inv (object *op, int flag) |
1955 | flag_inv (object *op, int flag) |
| 1946 | { |
1956 | { |
| 1947 | if (op->inv) |
|
|
| 1948 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1957 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1949 | { |
1958 | { |
| 1950 | SET_FLAG (tmp, flag); |
1959 | SET_FLAG (tmp, flag); |
| 1951 | flag_inv (tmp, flag); |
1960 | flag_inv (tmp, flag); |
| 1952 | } |
1961 | } |
| 1953 | } |
1962 | } |
| 1954 | |
1963 | |
| 1955 | /* |
1964 | /* |
| 1956 | * deactivate recursively a flag on an object inventory |
1965 | * deactivate recursively a flag on an object inventory |
| 1957 | */ |
1966 | */ |
| 1958 | void |
1967 | void |
| 1959 | unflag_inv (object *op, int flag) |
1968 | unflag_inv (object *op, int flag) |
| 1960 | { |
1969 | { |
| 1961 | if (op->inv) |
|
|
| 1962 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1970 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1963 | { |
1971 | { |
| 1964 | CLEAR_FLAG (tmp, flag); |
1972 | CLEAR_FLAG (tmp, flag); |
| 1965 | unflag_inv (tmp, flag); |
1973 | unflag_inv (tmp, flag); |
| 1966 | } |
1974 | } |
| 1967 | } |
1975 | } |
| 1968 | |
1976 | |
| 1969 | /* |
1977 | /* |
| 1970 | * 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 |
| 1971 | * 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 |
| … | |
… | |
| 1973 | * to search (see the freearr_x/y[] definition). |
1981 | * to search (see the freearr_x/y[] definition). |
| 1974 | * It returns a random choice among the alternatives found. |
1982 | * It returns a random choice among the alternatives found. |
| 1975 | * 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 |
| 1976 | * does all 4 immediate directions). This returns the index into the |
1984 | * does all 4 immediate directions). This returns the index into the |
| 1977 | * 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) |
| 1978 | * Note - this only checks to see if there is space for the head of the |
|
|
| 1979 | * object - if it is a multispace object, this should be called for all |
|
|
| 1980 | * pieces. |
|
|
| 1981 | * Note2: This function does correctly handle tiled maps, but does not |
1986 | * Note: This function does correctly handle tiled maps, but does not |
| 1982 | * inform the caller. However, insert_ob_in_map will update as |
1987 | * inform the caller. However, insert_ob_in_map will update as |
| 1983 | * 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. |
| 1984 | * 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 |
| 1985 | * 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 |
| 1986 | * 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 |
| … | |
… | |
| 2031 | |
2036 | |
| 2032 | /* 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 |
| 2033 | * head of the object should correspond for the entire object. |
2038 | * head of the object should correspond for the entire object. |
| 2034 | */ |
2039 | */ |
| 2035 | 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)) |
| 2036 | continue; |
2044 | continue; |
| 2037 | |
2045 | |
| 2038 | altern [index++] = i; |
2046 | altern [index++] = i; |
| 2039 | } |
2047 | } |
| 2040 | |
2048 | |
