ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.67 by root, Sat Jun 9 21:16:12 2007 UTC vs.
Revision 1.93 by root, Fri Nov 6 12:27:05 2009 UTC

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 it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * 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 Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <funcpoint.h>
29#include <loader.h> 28#include <loader.h>
30 29
31#include <tr1/functional> 30#include <tr1/functional>
32#include <tr1/unordered_map> 31#include <tr1/unordered_map>
33 32
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
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34arch_ptr archetype::empty;
43 35
44// the hashtable 36// the hashtable
45typedef std::tr1::unordered_map 37typedef std::tr1::unordered_map
46 < 38 <
47 const char *, 39 const char *,
… …
49 str_hash, 41 str_hash,
50 str_equal, 42 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 44 > HT;
53 45
54static HT ht (5000); 46static HT ht (10000);
55archvec archetypes; 47archvec archetypes;
48static unordered_vector<archetype *> allarch;
49static int dirtycnt;
50
51// the vector of other_arch references to be resolved
52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
53// the vector of loaded but not yet committed archetypes
54static std::vector<archetype *> postponed_arch;
55
56//+GPL
57
58/*
59 * Creates an object. This function is called by get_archetype()
60 * if it fails to find the appropriate archetype.
61 * Thus get_archetype() will be guaranteed to always return
62 * an object, and never NULL.
63 */
64object *
65create_singularity (const char *name)
66{
67 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
68
69 if (!strcmp (name, "bug"))
70 abort ();
71
72 object *op = archetype::get (shstr_bug);
73 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
74
75 return op;
76}
56 77
57/** 78/**
58 * GROS - This function retrieves an archetype given the name that appears 79 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 80 * 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. 81 * It does not use the hashtable system, but browse the whole archlist each time.
… …
104{ 125{
105 shstr_cmp skill_cmp (skill); 126 shstr_cmp skill_cmp (skill);
106 127
107 for_all_archetypes (at) 128 for_all_archetypes (at)
108 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 129 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 130 return at->instance ();
110 131
111 return 0; 132 return 0;
112} 133}
113 134
114/* similiar to above - this returns the first archetype 135/* similiar to above - this returns the first archetype
… …
135 * - name: The name we're searching for (ex: "writing pen"); 156 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 157 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 158 * - 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 159 * 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 160 * 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, 161 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 162 * but it otherwise had a big memory leak.
142 */ 163 */
143object * 164object *
144get_archetype_by_object_name (const char *name) 165get_archetype_by_object_name (const char *name)
145{ 166{
146 char tmpname[MAX_BUF]; 167 char tmpname[MAX_BUF];
147 int i;
148 168
149 assign (tmpname, name); 169 assign (tmpname, name);
150 170
151 for (i = strlen (tmpname); i > 0; i--) 171 for (int i = strlen (tmpname); i > 0; i--)
152 { 172 {
153 tmpname[i] = 0; 173 tmpname[i] = 0;
154 174
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 175 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 176 return at->instance ();
157 } 177 }
158 178
159 return create_singularity (name); 179 return create_singularity (name);
160} 180}
161 181
… …
195 return 1; 215 return 1;
196 216
197 /* unpaid is a little more specific */ 217 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 218 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
199 return 2; 219 return 2;
220
200 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 221 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
201 return 2; 222 return 2;
202 223
203 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 224 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
204 return 2; 225 return 2;
… …
226 * is because of the 'else' handling - we don't want to match on 247 * is because of the 'else' handling - we don't want to match on
227 * something and set a low retval, even though it may match a higher retcal 248 * something and set a low retval, even though it may match a higher retcal
228 * later. So keep it in descending order here, so we try for the best 249 * later. So keep it in descending order here, so we try for the best
229 * match first, and work downward. 250 * match first, and work downward.
230 */ 251 */
252 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
253
231 if (!strcasecmp (cp, query_name (op))) 254 if (!strcasecmp (cp, query_name (op)))
232 retval = 20; 255 retval = 20;
233 else if (!strcasecmp (cp, query_short_name (op))) 256 else if (!strcasecmp (cp, qsn = query_short_name (op)))
234 retval = 18; 257 retval = 18;
235 else if (!strcasecmp (cp, query_base_name (op, 0))) 258 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
236 retval = 16; 259 retval = 16;
237 else if (!strcasecmp (cp, query_base_name (op, 1))) 260 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
238 retval = 16; 261 retval = 16;
239 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 262 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
240 retval = 15; 263 retval = 15;
241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 264 else if (!strncasecmp (cp, qbn0, strlen (cp)))
242 retval = 14; 265 retval = 14;
243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 266 else if (!strncasecmp (cp, qbn1, strlen (cp)))
244 retval = 14; 267 retval = 14;
245 /* Do substring checks, so things like 'Str+1' will match. 268 /* Do substring checks, so things like 'Str+1' will match.
246 * retval of these should perhaps be lower - they are lower 269 * retval of these should perhaps be lower - they are lower
247 * then the specific strcasecmp aboves, but still higher than 270 * then the specific strcasecmp aboves, but still higher than
248 * some other match criteria. 271 * some other match criteria.
249 */ 272 */
250 else if (strstr (query_base_name (op, 1), cp)) 273 else if (strstr (qbn1, cp))
251 retval = 12; 274 retval = 12;
252 else if (strstr (query_base_name (op, 0), cp)) 275 else if (strstr (qbn0, cp))
253 retval = 12; 276 retval = 12;
254 else if (strstr (query_short_name (op), cp)) 277 else if (strstr (qsn, cp))
255 retval = 12; 278 retval = 12;
256 /* Check against plural/non plural based on count. */ 279 /* Check against plural/non plural based on count. */
257 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 280 else if (count > 1 && !strcasecmp (cp, op->name_pl))
258 retval = 6; 281 retval = 6;
259 else if (count == 1 && !strcasecmp (op->name, cp)) 282 else if (count == 1 && !strcasecmp (op->name, cp))
260 retval = 6; 283 retval = 6;
261 /* base name matched - not bad */ 284 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 285 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 286 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 287 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 288 else if (op->custom_name.contains (cp))
266 retval = 3; 289 retval = 3;
267 290
268 if (retval) 291 if (retval)
269 { 292 {
270 if (pl->type == PLAYER) 293 if (pl->type == PLAYER)
… …
275 } 298 }
276 299
277 return 0; 300 return 0;
278} 301}
279 302
303//-GPL
304
280archetype::archetype (const char *name) 305archetype::archetype (const char *name)
281{ 306{
282 stub = true;
283 arch = this; 307 arch = this;
284 this->archname = this->name = this->name_pl = name; 308 this->archname = this->name = this->name_pl = name;
285} 309}
286 310
287archetype::~archetype () 311archetype::~archetype ()
… …
290} 314}
291 315
292void 316void
293archetype::link () 317archetype::link ()
294{ 318{
295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this)) 319 if (!archetypes.contains (this))
320 {
298 archetypes.insert (this); 321 archetypes.insert (this);
322 ht.insert (std::make_pair (archname, this));
323 }
299} 324}
300 325
301void 326void
302archetype::unlink () 327archetype::unlink ()
303{ 328{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this)) 329 if (archetypes.contains (this))
330 {
307 archetypes.erase (this); 331 archetypes.erase (this);
332 ht.erase (archname);
333 }
308} 334}
309 335
310/* 336/*
311 * Finds, using the hashtable, which archetype matches the given name. 337 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL. 338 * returns a pointer to the found archetype, otherwise NULL.
… …
324 else 350 else
325 return i->second; 351 return i->second;
326} 352}
327 353
328archetype * 354archetype *
329archetype::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
348archetype *
349archetype::read (object_thawer &f) 355archetype::read (object_thawer &f)
350{ 356{
351 assert (f.kw == KW_object); 357 assert (f.kw == KW_object);
352 358
353 loading_arch = true; // hack to tell parse_kv et al. to behave
354
355 std::vector<archetype *> parts; 359 std::vector<archetype *> parts;
356 360
357 coroapi::cede_to_tick_every (10); 361 coroapi::cede_to_tick ();
358 362
359 for (;;) 363 for (;;)
360 { 364 {
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 ()); 365 archetype *at = new archetype (f.get_str ());
364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367 366
368 f.next (); 367 f.next ();
369 368
370#if 0 369#if 0
371 // implementing it here in the server does neither allow multiple inheritence 370 // implementing it here in the server does neither allow multiple inheritence
… …
382 381
383 f.next (); 382 f.next ();
384 } 383 }
385#endif 384#endif
386 385
386 loading_arch = at; // hack to tell parse_kv et al. to behave
387 bool parse_ok = at->parse_kv (f);
388 loading_arch = 0;
389
387 if (!at->parse_kv (f)) 390 if (!parse_ok)
388 goto fail; 391 goto fail;
389 392
393 loading_arch = at; // hack to tell parse_kv et al. to behave
390 at->post_load_check (); 394 at->post_load_check ();
395 loading_arch = 0;
391 396
392 parts.push_back (at); 397 parts.push_back (at);
393 398
394 if (f.kw != KW_more) 399 if (f.kw != KW_more)
395 break; 400 break;
… …
400 { 405 {
401 f.parse_error ("more object"); 406 f.parse_error ("more object");
402 goto fail; 407 goto fail;
403 } 408 }
404 } 409 }
405
406 loading_arch = false;
407 410
408 { 411 {
409 auto (at, parts.begin ()); 412 auto (at, parts.begin ());
410 413
411 archetype *new_head = parts.front (); 414 archetype *new_head = parts.front ();
… …
430 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 433 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
431 goto fail; 434 goto fail;
432 } 435 }
433 } 436 }
434 437
435 // deactivate existing archetype
436 for (archetype *at = old_head; at; at = (archetype *)at->more)
437 at->unlink ();
438
439 // assemble new chain 438 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x; 439 new_head->min_x = new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y; 440 new_head->min_y = new_head->max_y = new_head->y;
442 441
443 archetype *less = new_head; 442 archetype *less = new_head;
444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 443 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
445 { 444 {
446 archetype *at = *p; 445 archetype *at = *p;
447 446
448 // some flags get inherited formt he head (probably a lot more) 447 // some flags get inherited from the head (probably a lot more)
449 // doing it here doesn't feel too cozy, but it allows code 448 // doing it here doesn't feel too cozy, but it allows code
450 // to ignore head checks for these flags, which saves time 449 // to ignore head checks for these flags, which saves time
451 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 450 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
452 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 451 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
453 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 452 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
454 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 453 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
455 454
456 if (at->x < new_head->min_x) new_head->min_x = at->x; 455 new_head->min_x = min (new_head->min_x, at->x);
457 if (at->y < new_head->min_y) new_head->min_y = at->y; 456 new_head->min_y = min (new_head->min_y, at->y);
458 if (at->x > new_head->max_x) new_head->max_x = at->x; 457 new_head->max_x = max (new_head->max_x, at->x);
459 if (at->y > new_head->max_y) new_head->max_y = at->y; 458 new_head->max_y = max (new_head->max_y, at->y);
460 459
461 at->head = new_head; 460 at->head = new_head;
462 less->more = at; 461 less->more = at;
463 less = at; 462 less = at;
464 } 463 }
465 464
466 // now activate it 465 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
467 for (auto (p, parts.begin ()); p != parts.end (); ++p)
468 {
469 archetype *at = *p;
470 at->stub = false;
471 at->link ();
472 }
473 466
474 return new_head; 467 return new_head;
475 } 468 }
476 469
477fail: 470fail:
478 for (auto (p, parts.begin ()); p != parts.end (); ++p) 471 for (auto (p, parts.begin ()); p != parts.end (); ++p)
479 (*p)->destroy (true); 472 (*p)->destroy ();
480 473
481 loading_arch = false;
482 return 0; 474 return 0;
483} 475}
484 476
485/*
486 * Initialize global archtype pointers:
487 */
488void 477void
489init_archetype_pointers () 478archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
490{ 479{
491 ring_arch = archetype::find ("ring"); 480 ref = 0;
492 amulet_arch = archetype::find ("amulet"); 481 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
493 staff_arch = archetype::find ("staff");
494 crown_arch = archetype::find ("crown");
495 empty_archetype = archetype::find ("empty_archetype");
496} 482}
497 483
498/* 484void
499 * Creates and returns a new object which is a copy of the given archetype. 485archetype::commit_load ()
500 * This function returns NULL on failure.
501 */
502object *
503arch_to_object (archetype *at)
504{ 486{
487 // unlink old archetypes and link in new ones */
488 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
489 {
490 archetype *at = *p;
491
492 if (archetype *old = find (at->archname))
493 old->unlink ();
494
495 allarch.push_back (at);
496
497 at->link ();
498 ++dirtycnt;
499 }
500
501 postponed_arch.clear ();
502
503 // now resolve arch references
504 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
505 {
506 arch_ptr *ap = p->first;
507 archetype *at = find (p->second);
508
505 if (!at) 509 if (!at)
510 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
511
512 *ap = at;
506 { 513 }
507 LOG (llevError, "Couldn't find archetype.\n"); 514
515 postponed_arch_ref.clear ();
516
517 empty = find (shstr_empty_archetype);
518}
519
520void
521archetype::gc ()
522{
523 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
524 dirtycnt = max (0, dirtycnt - cnt);
525
526 do
527 {
528 static int idx;
529
530 if (idx >= allarch.size ())
531 if (idx)
532 idx = 0;
533 else
508 return 0; 534 return;
509 }
510 535
536 archetype *at = allarch [idx];
537
538 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
539 ++idx;
540 else
541 {
542 LOG (llevDebug, "garbage collect arch %s", &at->archname);
543 assert (at->arch == at); // verify that refcnt == 1 is truly valid
544 allarch.erase (idx);
545
546 // break chain
547 for (object *op = at->head_ (); op; )
548 {
549 object *next = op->more;
550 op->head = 0;
551 op->more = 0;
552 op = next;
553 }
554
555 at->destroy ();
556 at->arch = 0;
557 }
558 }
559 while (--cnt);
560}
561
562object *
563archetype::instance ()
564{
511 object *op = at->clone (); 565 object *op = clone ();
512 op->arch = at;
513 op->instantiate (); 566 op->instantiate ();
514
515 return op; 567 return op;
516} 568}
517 569
518/* 570//+GPL
519 * Creates an object. This function is called by get_archetype()
520 * if it fails to find the appropriate archetype.
521 * Thus get_archetype() will be guaranteed to always return
522 * an object, and never NULL.
523 */
524object *
525create_singularity (const char *name)
526{
527 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
528
529 if (!strcmp (name, "bug"))
530 abort ();
531
532 char buf[MAX_BUF];
533 sprintf (buf, "bug, please report (%s)", name);
534
535 object *op = get_archetype ("bug");
536 op->name = op->name_pl = buf;
537
538 return op;
539}
540 571
541/* 572/*
542 * Finds which archetype matches the given name, and returns a new 573 * Finds which archetype matches the given name, and returns a new
543 * object containing a copy of the archetype. 574 * object containing a copy of the archetype.
544 */ 575 */
545object * 576object *
546get_archetype (const char *name) 577get_archetype (const char *name)
547{ 578{
579 return archetype::get (name);
580}
581
582object *
583archetype::get (const char *name)
584{
548 archetype *at = archetype::find (name); 585 archetype *at = find (name);
549 586
550 if (!at) 587 if (!at)
551 return create_singularity (name); 588 return create_singularity (name);
552 589
553 return arch_to_object (at); 590 return at->instance ();
554} 591}
555 592
556/* 593/*
557 * Returns the first archetype using the given type. 594 * Returns the first archetype using the given type.
558 * Used in treasure-generation. 595 * Used in treasure-generation.
… …
573 * Used in treasure-generation. 610 * Used in treasure-generation.
574 */ 611 */
575object * 612object *
576clone_arch (int type) 613clone_arch (int type)
577{ 614{
578 archetype *at; 615 archetype *at = type_to_archetype (type);
579 616
580 if ((at = type_to_archetype (type)) == NULL) 617 if (!at)
581 { 618 {
582 LOG (llevError, "Can't clone archetype %d\n", type); 619 LOG (llevError, "Can't clone archetype %d\n", type);
583 return 0; 620 return 0;
584 } 621 }
585 622
586 object *op = at->clone (); 623 return at->instance ();
587 op->instantiate ();
588 return op;
589} 624}
590 625
591/* 626/*
592 * member: make instance from class 627 * member: make instance from class
593 */ 628 */
… …
596{ 631{
597 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
598 633
599 while (at) 634 while (at)
600 { 635 {
601 op = arch_to_object (at); 636 op = at->instance ();
602 637
603 op->x = at->x; 638 op->x = at->x;
604 op->y = at->y; 639 op->y = at->y;
605 640
606 if (head) 641 if (head)
… …
614 } 649 }
615 650
616 return head; 651 return head;
617} 652}
618 653
654//-GPL
655

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines