1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * it under the terms of the GNU General Public License as published by |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, but |
13 | * This program is distributed in the hope that it will be useful, |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License along |
18 | * You should have received a copy of the GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | #include <cassert> |
24 | #include <cassert> |
26 | |
25 | |
27 | #include <global.h> |
26 | #include <global.h> |
28 | #include <funcpoint.h> |
|
|
29 | #include <loader.h> |
27 | #include <loader.h> |
30 | |
28 | |
31 | #include <tr1/functional> |
29 | #include <tr1/functional> |
32 | #include <tr1/unordered_map> |
30 | #include <tr1/unordered_map> |
33 | |
31 | |
34 | /* The naming of these functions is really poor - they are all |
|
|
35 | * pretty much named '.._arch_...', but they may more may not |
|
|
36 | * return archetypes. Some make the arch_to_object call, and thus |
|
|
37 | * return an object. Perhaps those should be called 'archob' functions |
|
|
38 | * to denote they return an object derived from the archetype. |
|
|
39 | * MSW 2003-04-29 |
|
|
40 | */ |
|
|
41 | |
|
|
42 | bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing |
32 | archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing |
|
|
33 | arch_ptr archetype::empty; |
43 | |
34 | |
44 | // the hashtable |
35 | // the hashtable |
45 | typedef std::tr1::unordered_map |
36 | typedef std::tr1::unordered_map |
46 | < |
37 | < |
47 | const char *, |
38 | const char *, |
… | |
… | |
49 | str_hash, |
40 | str_hash, |
50 | str_equal, |
41 | str_equal, |
51 | slice_allocator< std::pair<const char *const, arch_ptr> > |
42 | slice_allocator< std::pair<const char *const, arch_ptr> > |
52 | > HT; |
43 | > HT; |
53 | |
44 | |
54 | static HT ht (5000); |
45 | static HT ht (10000); |
55 | archvec archetypes; |
46 | archvec archetypes; |
|
|
47 | static unordered_vector<archetype *> allarch; |
|
|
48 | static int dirtycnt; |
|
|
49 | |
|
|
50 | // the vector of other_arch references to be resolved |
|
|
51 | static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref; |
|
|
52 | // the vector of loaded but not yet committed archetypes |
|
|
53 | static std::vector<archetype *> postponed_arch; |
56 | |
54 | |
57 | /** |
55 | /** |
58 | * GROS - This function retrieves an archetype given the name that appears |
56 | * GROS - This function retrieves an archetype given the name that appears |
59 | * during the game (for example, "writing pen" instead of "stylus"). |
57 | * during the game (for example, "writing pen" instead of "stylus"). |
60 | * It does not use the hashtable system, but browse the whole archlist each time. |
58 | * It does not use the hashtable system, but browse the whole archlist each time. |
… | |
… | |
104 | { |
102 | { |
105 | shstr_cmp skill_cmp (skill); |
103 | shstr_cmp skill_cmp (skill); |
106 | |
104 | |
107 | for_all_archetypes (at) |
105 | for_all_archetypes (at) |
108 | if (at->skill == skill_cmp && (type == -1 || type == at->type)) |
106 | if (at->skill == skill_cmp && (type == -1 || type == at->type)) |
109 | return arch_to_object (at); |
107 | return at->instance (); |
110 | |
108 | |
111 | return 0; |
109 | return 0; |
112 | } |
110 | } |
113 | |
111 | |
114 | /* similiar to above - this returns the first archetype |
112 | /* similiar to above - this returns the first archetype |
… | |
… | |
135 | * - name: The name we're searching for (ex: "writing pen"); |
133 | * - name: The name we're searching for (ex: "writing pen"); |
136 | * Return value: |
134 | * Return value: |
137 | * - a corresponding object if found; a singularity object if not found. |
135 | * - a corresponding object if found; a singularity object if not found. |
138 | * Note by MSW - it appears that it takes the full name and keeps |
136 | * Note by MSW - it appears that it takes the full name and keeps |
139 | * shortening it until it finds a match. I re-wrote this so that it |
137 | * shortening it until it finds a match. I re-wrote this so that it |
140 | * doesn't malloc it each time - not that this function is used much, |
138 | * doesn't allocate it each time - not that this function is used much, |
141 | * but it otherwise had a big memory leak. |
139 | * but it otherwise had a big memory leak. |
142 | */ |
140 | */ |
143 | object * |
141 | object * |
144 | get_archetype_by_object_name (const char *name) |
142 | get_archetype_by_object_name (const char *name) |
145 | { |
143 | { |
… | |
… | |
151 | for (i = strlen (tmpname); i > 0; i--) |
149 | for (i = strlen (tmpname); i > 0; i--) |
152 | { |
150 | { |
153 | tmpname[i] = 0; |
151 | tmpname[i] = 0; |
154 | |
152 | |
155 | if (archetype *at = find_archetype_by_object_name (tmpname)) |
153 | if (archetype *at = find_archetype_by_object_name (tmpname)) |
156 | return arch_to_object (at); |
154 | return at->instance (); |
157 | } |
155 | } |
158 | |
156 | |
159 | return create_singularity (name); |
157 | return create_singularity (name); |
160 | } |
158 | } |
161 | |
159 | |
… | |
… | |
260 | retval = 6; |
258 | retval = 6; |
261 | /* base name matched - not bad */ |
259 | /* base name matched - not bad */ |
262 | else if (strcasecmp (cp, op->name) == 0 && !count) |
260 | else if (strcasecmp (cp, op->name) == 0 && !count) |
263 | retval = 4; |
261 | retval = 4; |
264 | /* Check for partial custom name, but give a real low priority */ |
262 | /* Check for partial custom name, but give a real low priority */ |
265 | else if (op->custom_name && strstr (op->custom_name, cp)) |
263 | else if (op->custom_name && op->custom_name.contains (cp)) |
266 | retval = 3; |
264 | retval = 3; |
267 | |
265 | |
268 | if (retval) |
266 | if (retval) |
269 | { |
267 | { |
270 | if (pl->type == PLAYER) |
268 | if (pl->type == PLAYER) |
… | |
… | |
277 | return 0; |
275 | return 0; |
278 | } |
276 | } |
279 | |
277 | |
280 | archetype::archetype (const char *name) |
278 | archetype::archetype (const char *name) |
281 | { |
279 | { |
282 | stub = true; |
|
|
283 | arch = this; |
280 | arch = this; |
284 | this->archname = this->name = this->name_pl = name; |
281 | this->archname = this->name = this->name_pl = name; |
285 | } |
282 | } |
286 | |
283 | |
287 | archetype::~archetype () |
284 | archetype::~archetype () |
… | |
… | |
290 | } |
287 | } |
291 | |
288 | |
292 | void |
289 | void |
293 | archetype::link () |
290 | archetype::link () |
294 | { |
291 | { |
295 | ht.insert (std::make_pair (archname, this)); |
|
|
296 | |
|
|
297 | if (!archetypes.contains (this)) |
292 | if (!archetypes.contains (this)) |
|
|
293 | { |
298 | archetypes.insert (this); |
294 | archetypes.insert (this); |
|
|
295 | ht.insert (std::make_pair (archname, this)); |
|
|
296 | } |
299 | } |
297 | } |
300 | |
298 | |
301 | void |
299 | void |
302 | archetype::unlink () |
300 | archetype::unlink () |
303 | { |
301 | { |
304 | ht.erase (archname); |
|
|
305 | if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D |
|
|
306 | if (archetypes.contains (this)) |
302 | if (archetypes.contains (this)) |
|
|
303 | { |
307 | archetypes.erase (this); |
304 | archetypes.erase (this); |
|
|
305 | ht.erase (archname); |
|
|
306 | } |
308 | } |
307 | } |
309 | |
308 | |
310 | /* |
309 | /* |
311 | * Finds, using the hashtable, which archetype matches the given name. |
310 | * Finds, using the hashtable, which archetype matches the given name. |
312 | * returns a pointer to the found archetype, otherwise NULL. |
311 | * returns a pointer to the found archetype, otherwise NULL. |
… | |
… | |
324 | else |
323 | else |
325 | return i->second; |
324 | return i->second; |
326 | } |
325 | } |
327 | |
326 | |
328 | archetype * |
327 | archetype * |
329 | archetype::get (const char *name) |
|
|
330 | { |
|
|
331 | if (!name) |
|
|
332 | { |
|
|
333 | LOG (llevError, "null archetype requested\n"); |
|
|
334 | name = "(null)"; |
|
|
335 | } |
|
|
336 | |
|
|
337 | archetype *at = find (name); |
|
|
338 | |
|
|
339 | if (!at) |
|
|
340 | { |
|
|
341 | at = new archetype (name); |
|
|
342 | at->link (); |
|
|
343 | } |
|
|
344 | |
|
|
345 | return at; |
|
|
346 | } |
|
|
347 | |
|
|
348 | archetype * |
|
|
349 | archetype::read (object_thawer &f) |
328 | archetype::read (object_thawer &f) |
350 | { |
329 | { |
351 | assert (f.kw == KW_object); |
330 | assert (f.kw == KW_object); |
352 | |
331 | |
353 | loading_arch = true; // hack to tell parse_kv et al. to behave |
|
|
354 | |
|
|
355 | std::vector<archetype *> parts; |
332 | std::vector<archetype *> parts; |
356 | |
333 | |
357 | coroapi::cede_to_tick_every (10); |
334 | coroapi::cede_to_tick (); |
358 | |
335 | |
359 | for (;;) |
336 | for (;;) |
360 | { |
337 | { |
361 | // the archetype might have been referenced earlier |
|
|
362 | // so try to find an existing stub archetype first |
|
|
363 | archetype *at = find (f.get_str ()); |
338 | archetype *at = new archetype (f.get_str ()); |
364 | |
|
|
365 | if (!at || !at->stub) |
|
|
366 | at = new archetype (f.get_str ()); |
|
|
367 | |
339 | |
368 | f.next (); |
340 | f.next (); |
369 | |
341 | |
370 | #if 0 |
342 | #if 0 |
371 | // implementing it here in the server does neither allow multiple inheritence |
343 | // implementing it here in the server does neither allow multiple inheritence |
… | |
… | |
382 | |
354 | |
383 | f.next (); |
355 | f.next (); |
384 | } |
356 | } |
385 | #endif |
357 | #endif |
386 | |
358 | |
|
|
359 | loading_arch = at; // hack to tell parse_kv et al. to behave |
|
|
360 | bool parse_ok = at->parse_kv (f); |
|
|
361 | loading_arch = 0; |
|
|
362 | |
387 | if (!at->parse_kv (f)) |
363 | if (!parse_ok) |
388 | goto fail; |
364 | goto fail; |
389 | |
365 | |
|
|
366 | loading_arch = at; // hack to tell parse_kv et al. to behave |
390 | at->post_load_check (); |
367 | at->post_load_check (); |
|
|
368 | loading_arch = 0; |
391 | |
369 | |
392 | parts.push_back (at); |
370 | parts.push_back (at); |
393 | |
371 | |
394 | if (f.kw != KW_more) |
372 | if (f.kw != KW_more) |
395 | break; |
373 | break; |
… | |
… | |
400 | { |
378 | { |
401 | f.parse_error ("more object"); |
379 | f.parse_error ("more object"); |
402 | goto fail; |
380 | goto fail; |
403 | } |
381 | } |
404 | } |
382 | } |
405 | |
|
|
406 | loading_arch = false; |
|
|
407 | |
383 | |
408 | { |
384 | { |
409 | auto (at, parts.begin ()); |
385 | auto (at, parts.begin ()); |
410 | |
386 | |
411 | archetype *new_head = parts.front (); |
387 | archetype *new_head = parts.front (); |
… | |
… | |
430 | &new_part->archname, &((archetype *)old_part->head_ ())->archname); |
406 | &new_part->archname, &((archetype *)old_part->head_ ())->archname); |
431 | goto fail; |
407 | goto fail; |
432 | } |
408 | } |
433 | } |
409 | } |
434 | |
410 | |
435 | // deactivate existing archetype |
|
|
436 | for (archetype *at = old_head; at; at = (archetype *)at->more) |
|
|
437 | at->unlink (); |
|
|
438 | |
|
|
439 | // assemble new chain |
411 | // assemble new chain |
440 | new_head->min_x = new_head->max_x = new_head->x; |
412 | new_head->min_x = new_head->max_x = new_head->x; |
441 | new_head->min_y = new_head->max_y = new_head->y; |
413 | new_head->min_y = new_head->max_y = new_head->y; |
442 | |
414 | |
443 | archetype *less = new_head; |
415 | archetype *less = new_head; |
444 | for (auto (p, parts.begin () + 1); p != parts.end (); ++p) |
416 | for (auto (p, parts.begin () + 1); p != parts.end (); ++p) |
445 | { |
417 | { |
446 | archetype *at = *p; |
418 | archetype *at = *p; |
447 | |
419 | |
|
|
420 | // some flags get inherited from the head (probably a lot more) |
|
|
421 | // doing it here doesn't feel too cozy, but it allows code |
|
|
422 | // to ignore head checks for these flags, which saves time |
|
|
423 | at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; |
|
|
424 | at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; |
|
|
425 | at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; |
|
|
426 | at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; |
|
|
427 | |
448 | if (at->x < new_head->min_x) new_head->min_x = at->x; |
428 | new_head->min_x = min (new_head->min_x, at->x); |
449 | if (at->y < new_head->min_y) new_head->min_y = at->y; |
429 | new_head->min_y = min (new_head->min_y, at->y); |
450 | if (at->x > new_head->max_x) new_head->max_x = at->x; |
430 | new_head->max_x = max (new_head->max_x, at->x); |
451 | if (at->y > new_head->max_y) new_head->max_y = at->y; |
431 | new_head->max_y = max (new_head->max_y, at->y); |
452 | |
432 | |
453 | at->head = new_head; |
433 | at->head = new_head; |
454 | less->more = at; |
434 | less->more = at; |
455 | less = at; |
435 | less = at; |
456 | } |
436 | } |
457 | |
437 | |
458 | // now activate it |
438 | postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ()); |
459 | for (auto (p, parts.begin ()); p != parts.end (); ++p) |
|
|
460 | { |
|
|
461 | archetype *at = *p; |
|
|
462 | at->stub = false; |
|
|
463 | at->link (); |
|
|
464 | } |
|
|
465 | |
439 | |
466 | return new_head; |
440 | return new_head; |
467 | } |
441 | } |
468 | |
442 | |
469 | fail: |
443 | fail: |
470 | for (auto (p, parts.begin ()); p != parts.end (); ++p) |
444 | for (auto (p, parts.begin ()); p != parts.end (); ++p) |
471 | (*p)->destroy (true); |
445 | (*p)->destroy (); |
472 | |
446 | |
473 | loading_arch = false; |
|
|
474 | return 0; |
447 | return 0; |
475 | } |
448 | } |
476 | |
449 | |
477 | /* |
|
|
478 | * Initialize global archtype pointers: |
|
|
479 | */ |
|
|
480 | void |
450 | void |
481 | init_archetype_pointers () |
451 | archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) |
482 | { |
452 | { |
483 | ring_arch = archetype::find ("ring"); |
453 | ref = 0; |
484 | amulet_arch = archetype::find ("amulet"); |
454 | postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch))); |
485 | staff_arch = archetype::find ("staff"); |
|
|
486 | crown_arch = archetype::find ("crown"); |
|
|
487 | empty_archetype = archetype::find ("empty_archetype"); |
|
|
488 | } |
455 | } |
489 | |
456 | |
490 | /* |
457 | void |
491 | * Creates and returns a new object which is a copy of the given archetype. |
458 | archetype::commit_load () |
492 | * This function returns NULL on failure. |
|
|
493 | */ |
|
|
494 | object * |
|
|
495 | arch_to_object (archetype *at) |
|
|
496 | { |
459 | { |
|
|
460 | // unlink old archetypes and link in new ones */ |
|
|
461 | for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) |
|
|
462 | { |
|
|
463 | archetype *at = *p; |
|
|
464 | |
|
|
465 | if (archetype *old = find (at->archname)) |
|
|
466 | old->unlink (); |
|
|
467 | |
|
|
468 | allarch.push_back (at); |
|
|
469 | |
|
|
470 | at->link (); |
|
|
471 | ++dirtycnt; |
|
|
472 | } |
|
|
473 | |
|
|
474 | postponed_arch.clear (); |
|
|
475 | |
|
|
476 | // now resolve arch references |
|
|
477 | for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) |
|
|
478 | { |
|
|
479 | arch_ptr *ap = p->first; |
|
|
480 | archetype *at = find (p->second); |
|
|
481 | |
497 | if (!at) |
482 | if (!at) |
|
|
483 | LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second); |
|
|
484 | |
|
|
485 | *ap = at; |
498 | { |
486 | } |
499 | LOG (llevError, "Couldn't find archetype.\n"); |
487 | |
|
|
488 | postponed_arch_ref.clear (); |
|
|
489 | |
|
|
490 | empty = find (shstr_empty_archetype); |
|
|
491 | } |
|
|
492 | |
|
|
493 | void |
|
|
494 | archetype::gc () |
|
|
495 | { |
|
|
496 | int cnt = max (1, min (allarch.size () / 128, dirtycnt)); |
|
|
497 | dirtycnt = max (0, dirtycnt - cnt); |
|
|
498 | |
|
|
499 | do |
|
|
500 | { |
|
|
501 | static int idx; |
|
|
502 | |
|
|
503 | if (idx >= allarch.size ()) |
|
|
504 | if (idx) |
|
|
505 | idx = 0; |
|
|
506 | else |
500 | return 0; |
507 | return; |
501 | } |
|
|
502 | |
508 | |
|
|
509 | archetype *at = allarch [idx]; |
|
|
510 | |
|
|
511 | if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object |
|
|
512 | ++idx; |
|
|
513 | else |
|
|
514 | { |
|
|
515 | LOG (llevDebug, "garbage collect arch %s", &at->archname); |
|
|
516 | assert (at->arch == at); // verify that refcnt == 1 is truly valid |
|
|
517 | allarch.erase (idx); |
|
|
518 | |
|
|
519 | // break chain |
|
|
520 | for (object *op = at->head_ (); op; ) |
|
|
521 | { |
|
|
522 | object *next = op->more; |
|
|
523 | op->head = 0; |
|
|
524 | op->more = 0; |
|
|
525 | op = next; |
|
|
526 | } |
|
|
527 | |
|
|
528 | at->destroy (); |
|
|
529 | at->arch = 0; |
|
|
530 | } |
|
|
531 | } |
|
|
532 | while (--cnt); |
|
|
533 | } |
|
|
534 | |
|
|
535 | object * |
|
|
536 | archetype::instance () |
|
|
537 | { |
503 | object *op = at->clone (); |
538 | object *op = clone (); |
504 | op->arch = at; |
|
|
505 | op->instantiate (); |
539 | op->instantiate (); |
506 | |
|
|
507 | return op; |
540 | return op; |
508 | } |
541 | } |
509 | |
542 | |
510 | /* |
543 | /* |
511 | * Creates an object. This function is called by get_archetype() |
544 | * Creates an object. This function is called by get_archetype() |
… | |
… | |
519 | LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); |
552 | LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); |
520 | |
553 | |
521 | if (!strcmp (name, "bug")) |
554 | if (!strcmp (name, "bug")) |
522 | abort (); |
555 | abort (); |
523 | |
556 | |
524 | char buf[MAX_BUF]; |
|
|
525 | sprintf (buf, "bug, please report (%s)", name); |
|
|
526 | |
|
|
527 | object *op = get_archetype ("bug"); |
557 | object *op = archetype::get (shstr_bug); |
528 | op->name = op->name_pl = buf; |
558 | op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); |
529 | |
559 | |
530 | return op; |
560 | return op; |
531 | } |
561 | } |
532 | |
562 | |
533 | /* |
563 | /* |
… | |
… | |
535 | * object containing a copy of the archetype. |
565 | * object containing a copy of the archetype. |
536 | */ |
566 | */ |
537 | object * |
567 | object * |
538 | get_archetype (const char *name) |
568 | get_archetype (const char *name) |
539 | { |
569 | { |
|
|
570 | return archetype::get (name); |
|
|
571 | } |
|
|
572 | |
|
|
573 | object * |
|
|
574 | archetype::get (const char *name) |
|
|
575 | { |
540 | archetype *at = archetype::find (name); |
576 | archetype *at = find (name); |
541 | |
577 | |
542 | if (!at) |
578 | if (!at) |
543 | return create_singularity (name); |
579 | return create_singularity (name); |
544 | |
580 | |
545 | return arch_to_object (at); |
581 | return at->instance (); |
546 | } |
582 | } |
547 | |
583 | |
548 | /* |
584 | /* |
549 | * Returns the first archetype using the given type. |
585 | * Returns the first archetype using the given type. |
550 | * Used in treasure-generation. |
586 | * Used in treasure-generation. |
… | |
… | |
565 | * Used in treasure-generation. |
601 | * Used in treasure-generation. |
566 | */ |
602 | */ |
567 | object * |
603 | object * |
568 | clone_arch (int type) |
604 | clone_arch (int type) |
569 | { |
605 | { |
570 | archetype *at; |
606 | archetype *at = type_to_archetype (type); |
571 | |
607 | |
572 | if ((at = type_to_archetype (type)) == NULL) |
608 | if (!at) |
573 | { |
609 | { |
574 | LOG (llevError, "Can't clone archetype %d\n", type); |
610 | LOG (llevError, "Can't clone archetype %d\n", type); |
575 | return 0; |
611 | return 0; |
576 | } |
612 | } |
577 | |
613 | |
578 | object *op = at->clone (); |
614 | return at->instance (); |
579 | op->instantiate (); |
|
|
580 | return op; |
|
|
581 | } |
615 | } |
582 | |
616 | |
583 | /* |
617 | /* |
584 | * member: make instance from class |
618 | * member: make instance from class |
585 | */ |
619 | */ |
… | |
… | |
588 | { |
622 | { |
589 | object *op, *prev = 0, *head = 0; |
623 | object *op, *prev = 0, *head = 0; |
590 | |
624 | |
591 | while (at) |
625 | while (at) |
592 | { |
626 | { |
593 | op = arch_to_object (at); |
627 | op = at->instance (); |
594 | |
628 | |
595 | op->x = at->x; |
629 | op->x = at->x; |
596 | op->y = at->y; |
630 | op->y = at->y; |
597 | |
631 | |
598 | if (head) |
632 | if (head) |