| … | |
… | |
| 963 | |
963 | |
| 964 | void |
964 | void |
| 965 | object::do_destroy () |
965 | object::do_destroy () |
| 966 | { |
966 | { |
| 967 | if (flag [FLAG_IS_LINKED]) |
967 | if (flag [FLAG_IS_LINKED]) |
| 968 | remove_button_link (this); |
968 | remove_link (); |
| 969 | |
969 | |
| 970 | if (flag [FLAG_FRIENDLY]) |
970 | if (flag [FLAG_FRIENDLY]) |
| 971 | remove_friendly_object (this); |
971 | remove_friendly_object (this); |
| 972 | |
972 | |
| 973 | remove (); |
973 | remove (); |
| … | |
… | |
| 1494 | /* this function inserts an object in the map, but if it |
1494 | /* this function inserts an object in the map, but if it |
| 1495 | * finds an object of its own type, it'll remove that one first. |
1495 | * finds an object of its own type, it'll remove that one first. |
| 1496 | * op is the object to insert it under: supplies x and the map. |
1496 | * op is the object to insert it under: supplies x and the map. |
| 1497 | */ |
1497 | */ |
| 1498 | void |
1498 | void |
| 1499 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1499 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
| 1500 | { |
1500 | { |
| 1501 | /* first search for itself and remove any old instances */ |
1501 | /* first search for itself and remove any old instances */ |
| 1502 | |
1502 | |
| 1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
| 1504 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1504 | if (tmp->arch->archname == archname) /* same archetype */ |
| 1505 | tmp->destroy (); |
1505 | tmp->destroy (); |
| 1506 | |
1506 | |
| 1507 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1507 | object *tmp = arch_to_object (archetype::find (archname)); |
| 1508 | |
1508 | |
| 1509 | tmp->x = op->x; |
1509 | tmp->x = op->x; |
| 1510 | tmp->y = op->y; |
1510 | tmp->y = op->y; |
| 1511 | |
1511 | |
| 1512 | insert_ob_in_map (tmp, op->map, op, 0); |
1512 | insert_ob_in_map (tmp, op->map, op, 0); |
| … | |
… | |
| 2174 | * This basically means that if direction is 15, then it could either go |
2174 | * This basically means that if direction is 15, then it could either go |
| 2175 | * direction 4, 14, or 16 to get back to where we are. |
2175 | * direction 4, 14, or 16 to get back to where we are. |
| 2176 | * Moved from spell_util.c to object.c with the other related direction |
2176 | * Moved from spell_util.c to object.c with the other related direction |
| 2177 | * functions. |
2177 | * functions. |
| 2178 | */ |
2178 | */ |
| 2179 | int reduction_dir[SIZEOFFREE][3] = { |
2179 | const int reduction_dir[SIZEOFFREE][3] = { |
| 2180 | {0, 0, 0}, /* 0 */ |
2180 | {0, 0, 0}, /* 0 */ |
| 2181 | {0, 0, 0}, /* 1 */ |
2181 | {0, 0, 0}, /* 1 */ |
| 2182 | {0, 0, 0}, /* 2 */ |
2182 | {0, 0, 0}, /* 2 */ |
| 2183 | {0, 0, 0}, /* 3 */ |
2183 | {0, 0, 0}, /* 3 */ |
| 2184 | {0, 0, 0}, /* 4 */ |
2184 | {0, 0, 0}, /* 4 */ |
| … | |
… | |
| 2322 | return tmp; |
2322 | return tmp; |
| 2323 | |
2323 | |
| 2324 | return 0; |
2324 | return 0; |
| 2325 | } |
2325 | } |
| 2326 | |
2326 | |
| 2327 | const shstr & |
2327 | shstr_tmp |
| 2328 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
| 2329 | { |
2329 | { |
| 2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2331 | if (kv->key == key) |
2331 | if (kv->key == key) |
| 2332 | return kv->value; |
2332 | return kv->value; |
| 2333 | |
2333 | |
| 2334 | return shstr_null; |
2334 | return shstr (); |
| 2335 | } |
2335 | } |
| 2336 | |
2336 | |
| 2337 | void |
2337 | void |
| 2338 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
| 2339 | { |
2339 | { |
| 2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2341 | if (kv->key == key) |
2341 | if (kv->key == key) |
| 2342 | { |
2342 | { |
| 2343 | kv->value = value; |
2343 | kv->value = value; |
| … | |
… | |
| 2352 | |
2352 | |
| 2353 | key_values = kv; |
2353 | key_values = kv; |
| 2354 | } |
2354 | } |
| 2355 | |
2355 | |
| 2356 | void |
2356 | void |
| 2357 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
| 2358 | { |
2358 | { |
| 2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
| 2360 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
| 2361 | { |
2361 | { |
| 2362 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
| … | |
… | |
| 2531 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
| 2532 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
| 2533 | } |
2533 | } |
| 2534 | |
2534 | |
| 2535 | object * |
2535 | object * |
| 2536 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
| 2537 | { |
2537 | { |
| 2538 | /* 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 |
| 2539 | * place |
2539 | * place |
| 2540 | */ |
2540 | */ |
| 2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
| … | |
… | |
| 2544 | |
2544 | |
| 2545 | return 0; |
2545 | return 0; |
| 2546 | } |
2546 | } |
| 2547 | |
2547 | |
| 2548 | object * |
2548 | object * |
| 2549 | object::force_add (const shstr name, int duration) |
2549 | object::force_add (shstr_tmp name, int duration) |
| 2550 | { |
2550 | { |
| 2551 | if (object *force = force_find (name)) |
2551 | if (object *force = force_find (name)) |
| 2552 | force->destroy (); |
2552 | force->destroy (); |
| 2553 | |
2553 | |
| 2554 | object *force = get_archetype (FORCE_NAME); |
2554 | object *force = get_archetype (FORCE_NAME); |
