… | |
… | |
1205 | object * |
1205 | object * |
1206 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1206 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1207 | { |
1207 | { |
1208 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1208 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1209 | { |
1209 | { |
1210 | tmp->x = x + tmp->arch->clone.x; |
1210 | tmp->x = x + tmp->arch->x; |
1211 | tmp->y = y + tmp->arch->clone.y; |
1211 | tmp->y = y + tmp->arch->y; |
1212 | } |
1212 | } |
1213 | |
1213 | |
1214 | return insert_ob_in_map (op, m, originator, flag); |
1214 | return insert_ob_in_map (op, m, originator, flag); |
1215 | } |
1215 | } |
1216 | |
1216 | |
… | |
… | |
1488 | object *tmp, *tmp1; |
1488 | object *tmp, *tmp1; |
1489 | |
1489 | |
1490 | /* first search for itself and remove any old instances */ |
1490 | /* first search for itself and remove any old instances */ |
1491 | |
1491 | |
1492 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1492 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1493 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1493 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1494 | tmp->destroy (); |
1494 | tmp->destroy (); |
1495 | |
1495 | |
1496 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1496 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1497 | |
1497 | |
1498 | tmp1->x = op->x; |
1498 | tmp1->x = op->x; |
… | |
… | |
2495 | /* Basically, if the archetype has this key set, |
2495 | /* Basically, if the archetype has this key set, |
2496 | * we need to store the null value so when we save |
2496 | * we need to store the null value so when we save |
2497 | * it, we save the empty value so that when we load, |
2497 | * it, we save the empty value so that when we load, |
2498 | * we get this value back again. |
2498 | * we get this value back again. |
2499 | */ |
2499 | */ |
2500 | if (get_ob_key_link (&op->arch->clone, canonical_key)) |
2500 | if (get_ob_key_link (op->arch, canonical_key)) |
2501 | field->value = 0; |
2501 | field->value = 0; |
2502 | else |
2502 | else |
2503 | { |
2503 | { |
2504 | if (last) |
2504 | if (last) |
2505 | last->next = field->next; |
2505 | last->next = field->next; |