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

Diff Legend

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