| … | |
… | |
| 1181 | if (more) |
1181 | if (more) |
| 1182 | return; |
1182 | return; |
| 1183 | |
1183 | |
| 1184 | object *prev = this; |
1184 | object *prev = this; |
| 1185 | |
1185 | |
| 1186 | for (archetype *at = arch->more; at; at = at->more) |
1186 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
| 1187 | { |
1187 | { |
| 1188 | object *op = arch_to_object (at); |
1188 | object *op = arch_to_object (at); |
| 1189 | |
1189 | |
| 1190 | op->name = name; |
1190 | op->name = name; |
| 1191 | op->name_pl = name_pl; |
1191 | op->name_pl = name_pl; |
| … | |
… | |
| 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 | |
| … | |
… | |
| 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; |
