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

Diff Legend

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