… | |
… | |
1286 | |
1286 | |
1287 | /* Ideally, the caller figures this out. However, it complicates a lot |
1287 | /* Ideally, the caller figures this out. However, it complicates a lot |
1288 | * of areas of callers (eg, anything that uses find_free_spot would now |
1288 | * of areas of callers (eg, anything that uses find_free_spot would now |
1289 | * need extra work |
1289 | * need extra work |
1290 | */ |
1290 | */ |
|
|
1291 | maptile *newmap = m; |
1291 | if (!xy_normalise (m, op->x, op->y)) |
1292 | if (!xy_normalise (newmap, op->x, op->y)) |
1292 | { |
1293 | { |
1293 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1294 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1294 | return 0; |
1295 | return 0; |
1295 | } |
1296 | } |
1296 | |
1297 | |
… | |
… | |
1298 | if (!insert_ob_in_map (more, m, originator, flag)) |
1299 | if (!insert_ob_in_map (more, m, originator, flag)) |
1299 | return 0; |
1300 | return 0; |
1300 | |
1301 | |
1301 | CLEAR_FLAG (op, FLAG_REMOVED); |
1302 | CLEAR_FLAG (op, FLAG_REMOVED); |
1302 | |
1303 | |
1303 | op->map = m; |
1304 | op->map = newmap; |
1304 | mapspace &ms = op->ms (); |
1305 | mapspace &ms = op->ms (); |
1305 | |
1306 | |
1306 | /* this has to be done after we translate the coordinates. |
1307 | /* this has to be done after we translate the coordinates. |
1307 | */ |
1308 | */ |
1308 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1309 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
2056 | * there is capable of. |
2057 | * there is capable of. |
2057 | */ |
2058 | */ |
2058 | int |
2059 | int |
2059 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | { |
2061 | { |
2061 | int i, max = SIZEOFFREE, mflags; |
2062 | int max = SIZEOFFREE, mflags; |
2062 | |
|
|
2063 | sint16 nx, ny; |
|
|
2064 | object *tmp; |
|
|
2065 | maptile *mp; |
|
|
2066 | |
|
|
2067 | MoveType blocked, move_type; |
2063 | MoveType move_type; |
2068 | |
2064 | |
2069 | if (exclude && exclude->head_ () != exclude) |
2065 | if (exclude && exclude->head_ () != exclude) |
2070 | { |
2066 | { |
2071 | exclude = exclude->head; |
2067 | exclude = exclude->head; |
2072 | move_type = exclude->move_type; |
2068 | move_type = exclude->move_type; |
… | |
… | |
2075 | { |
2071 | { |
2076 | /* If we don't have anything, presume it can use all movement types. */ |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2077 | move_type = MOVE_ALL; |
2073 | move_type = MOVE_ALL; |
2078 | } |
2074 | } |
2079 | |
2075 | |
2080 | for (i = 1; i < max; i++) |
2076 | for (int i = 1; i < max; i++) |
2081 | { |
2077 | { |
2082 | mp = m; |
2078 | mapxy pos (m, x, y); |
2083 | nx = x + freearr_x[i]; |
2079 | pos.move (i); |
2084 | ny = y + freearr_y[i]; |
|
|
2085 | |
2080 | |
2086 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2081 | if (!pos.normalise ()) |
2087 | |
|
|
2088 | if (mflags & P_OUT_OF_MAP) |
|
|
2089 | max = maxfree[i]; |
2082 | max = maxfree[i]; |
2090 | else |
2083 | else |
2091 | { |
2084 | { |
2092 | mapspace &ms = mp->at (nx, ny); |
2085 | mapspace &ms = *pos; |
2093 | |
2086 | |
2094 | blocked = ms.move_block; |
|
|
2095 | |
|
|
2096 | if ((move_type & blocked) == move_type) |
2087 | if ((move_type & ms.move_block) == move_type) |
2097 | max = maxfree[i]; |
2088 | max = maxfree [i]; |
2098 | else if (mflags & P_IS_ALIVE) |
2089 | else if (ms.flags () & P_IS_ALIVE) |
2099 | { |
2090 | { |
2100 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2091 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2101 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2092 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2102 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2093 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2103 | break; |
|
|
2104 | |
|
|
2105 | if (tmp) |
|
|
2106 | return freedir[i]; |
2094 | return freedir [i]; |
2107 | } |
2095 | } |
2108 | } |
2096 | } |
2109 | } |
2097 | } |
2110 | |
2098 | |
2111 | return 0; |
2099 | return 0; |
… | |
… | |
2334 | return tmp; |
2322 | return tmp; |
2335 | |
2323 | |
2336 | return 0; |
2324 | return 0; |
2337 | } |
2325 | } |
2338 | |
2326 | |
2339 | const shstr & |
2327 | shstr_tmp |
2340 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
2341 | { |
2329 | { |
2342 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2343 | if (kv->key == key) |
2331 | if (kv->key == key) |
2344 | return kv->value; |
2332 | return kv->value; |
2345 | |
2333 | |
2346 | return shstr_null; |
2334 | return shstr (); |
2347 | } |
2335 | } |
2348 | |
2336 | |
2349 | void |
2337 | void |
2350 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2351 | { |
2339 | { |
2352 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2353 | if (kv->key == key) |
2341 | if (kv->key == key) |
2354 | { |
2342 | { |
2355 | kv->value = value; |
2343 | kv->value = value; |
… | |
… | |
2364 | |
2352 | |
2365 | key_values = kv; |
2353 | key_values = kv; |
2366 | } |
2354 | } |
2367 | |
2355 | |
2368 | void |
2356 | void |
2369 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
2370 | { |
2358 | { |
2371 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2372 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
2373 | { |
2361 | { |
2374 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
… | |
… | |
2543 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
2544 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
2545 | } |
2533 | } |
2546 | |
2534 | |
2547 | object * |
2535 | object * |
2548 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
2549 | { |
2537 | { |
2550 | /* cycle through his inventory to look for the MARK we want to |
2538 | /* cycle through his inventory to look for the MARK we want to |
2551 | * place |
2539 | * place |
2552 | */ |
2540 | */ |
2553 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2556 | |
2544 | |
2557 | return 0; |
2545 | return 0; |
2558 | } |
2546 | } |
2559 | |
2547 | |
2560 | object * |
2548 | object * |
2561 | object::force_add (const shstr name, int duration) |
2549 | object::force_add (shstr_tmp name, int duration) |
2562 | { |
2550 | { |
2563 | if (object *force = force_find (name)) |
2551 | if (object *force = force_find (name)) |
2564 | force->destroy (); |
2552 | force->destroy (); |
2565 | |
2553 | |
2566 | object *force = get_archetype (FORCE_NAME); |
2554 | object *force = get_archetype (FORCE_NAME); |