| … | |
… | |
| 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 */ |
