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.48 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.89 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <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);
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
55static std::vector<archetype *> archetypes; 54static std::vector<archetype *> postponed_arch;
56 55
57/** 56/**
58 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 58 * 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. 59 * It does not use the hashtable system, but browse the whole archlist each time.
68archetype * 67archetype *
69find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
70{ 69{
71 shstr_cmp name_cmp (name); 70 shstr_cmp name_cmp (name);
72 71
73 for (archetype *at = first_archetype; at; at = at->next) 72 for_all_archetypes (at)
74 if (at->clone.name == name_cmp) 73 if (at->name == name_cmp)
75 return at; 74 return at;
76 75
77 return 0; 76 return 0;
78} 77}
79 78
85archetype * 84archetype *
86find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
87{ 86{
88 shstr_cmp name_cmp (name); 87 shstr_cmp name_cmp (name);
89 88
90 for (archetype *at = first_archetype; at; at = at->next) 89 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.type == type) 90 if (at->name == name_cmp && at->type == type)
92 return at; 91 return at;
93 92
94 return 0; 93 return 0;
95} 94}
96 95
102object * 101object *
103get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
104{ 103{
105 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
106 105
107 for (archetype *at = first_archetype; at; at = at->next) 106 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 108 return at->instance ();
110 109
111 return 0; 110 return 0;
112} 111}
113 112
114/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
119 * (eg, skills) 118 * (eg, skills)
120 */ 119 */
121archetype * 120archetype *
122get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
123{ 122{
124 for (archetype *at = first_archetype; at; at = at->next) 123 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 125 return at;
127 126
128 return 0; 127 return 0;
129} 128}
130 129
135 * - name: The name we're searching for (ex: "writing pen"); 134 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 135 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 136 * - 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 137 * 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 138 * 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, 139 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
142 */ 141 */
143object * 142object *
144get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
145{ 144{
151 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
152 { 151 {
153 tmpname[i] = 0; 152 tmpname[i] = 0;
154 153
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 154 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 155 return at->instance ();
157 } 156 }
158 157
159 return create_singularity (name); 158 return create_singularity (name);
160} 159}
161 160
162 /* This is a subset of the parse_id command. Basically, name can be 161/* This is a subset of the parse_id command. Basically, name can be
163 * a string seperated lists of things to match, with certain keywords. 162 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 163 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 164 * op is the item we are trying to match. Calling function takes care
166 * of what action might need to be done and if it is valid 165 * of what action might need to be done and if it is valid
167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 166 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 167 * value means a better match. 0 means no match.
169 * 168 *
170 * Brief outline of the procedure: 169 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 170 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 171 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 172 * Next, we check for a count (either specified in name, or in the
174 * player object.) 173 * player object.)
175 * If count is 1, make a quick check on the name. 174 * If count is 1, make a quick check on the name.
176 * IF count is >1, we need to make plural name. Return if match. 175 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 176 * Last, make a check on the full name.
178 */ 177 */
179int 178int
180item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
181{ 180{
182 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 182 int count, retval = 0;
260 retval = 6; 259 retval = 6;
261 /* base name matched - not bad */ 260 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 262 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name.contains (cp))
266 retval = 3; 265 retval = 3;
267 266
268 if (retval) 267 if (retval)
269 { 268 {
270 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
275 } 274 }
276 275
277 return 0; 276 return 0;
278} 277}
279 278
280archetype::archetype () 279archetype::archetype (const char *name)
281{ 280{
282 clone.arch = this; 281 arch = this;
283 282 this->archname = this->name = this->name_pl = name;
284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286} 283}
287 284
288archetype::~archetype () 285archetype::~archetype ()
289{ 286{
290 //TODO: nuke ->more's 287 unlink ();
291} 288}
292 289
293static void
294unlink (archetype *at)
295{
296 if (at->head)
297 at = at->head;
298
299 // destroy this archetype's link, making singletons out of its parts
300 while (at)
301 {
302 archetype *more = at->more;
303 at->clone.destroy_inv ();
304 at->head = at->more = 0;
305 at = more;
306 }
307}
308
309// dire hack, need to rationalise
310void 290void
311overwrite (archetype *at, object *op) 291archetype::link ()
312{ 292{
313 at->clone = *op; 293 if (!archetypes.contains (this))
314 294 {
315 at->clone.arch = at; 295 archetypes.insert (this);
316 //TODO: inv et al. 296 ht.insert (std::make_pair (archname, this));
297 }
298}
299
300void
301archetype::unlink ()
302{
303 if (archetypes.contains (this))
304 {
305 archetypes.erase (this);
306 ht.erase (archname);
307 }
308}
309
310/*
311 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL.
313 */
314archetype *
315archetype::find (const char *name)
316{
317 if (!name)
318 return 0;
319
320 auto (i, ht.find (name));
321
322 if (i == ht.end ())
323 return 0;
324 else
325 return i->second;
317} 326}
318 327
319archetype * 328archetype *
320archetype::read (object_thawer &f) 329archetype::read (object_thawer &f)
321{ 330{
322 assert (f.kw == KW_object); 331 assert (f.kw == KW_object);
323 332
324 archetype *head = get (f.get_str ()); 333 std::vector<archetype *> parts;
325 unlink (head);
326 object *op = object::create ();
327 334
328 if (!op->parse_kv (f)) 335 coroapi::cede_to_tick ();
329 { 336
330 op->destroy (true); 337 for (;;)
331 // leak head
332 return 0;
333 } 338 {
339 archetype *at = new archetype (f.get_str ());
334 340
335 overwrite (head, op);
336 op->destroy ();
337
338 for (archetype *prev = head; f.kw == KW_more; )
339 {
340 f.next (); 341 f.next ();
341 assert (f.kw == KW_object);
342 342
343 archetype *more = get (f.get_str ()); 343#if 0
344 unlink (more); 344 // implementing it here in the server does neither allow multiple inheritence
345 object *op = object::create (); 345 // nor does it cleanly "just override". it would allow use in map files, though,
346 346 // and other resource files dynamically laoded (as opposed to being preprocessed).
347 if (!op->parse_kv (f)) 347 // not that any of this is relevant as of yet...
348 if (f.kw == KW_inherit)
348 { 349 {
349 op->destroy (true); 350 if (archetype *at = find (f.get_str ()))
350 // leak head more* 351 *op = at->clone;
351 return 0; 352 else
353 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
354 &at->archname, f.get_str ());
355
356 f.next ();
352 } 357 }
358#endif
353 359
354 overwrite (more, op); 360 loading_arch = at; // hack to tell parse_kv et al. to behave
355 op->destroy (); 361 bool parse_ok = at->parse_kv (f);
362 loading_arch = 0;
356 363
357 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 364 if (!parse_ok)
358 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 365 goto fail;
359 366
360 more->head = head; 367 loading_arch = at; // hack to tell parse_kv et al. to behave
361 more->clone.head = &head->clone; 368 at->post_load_check ();
362 prev->more = more; 369 loading_arch = 0;
363 prev->clone.more = &more->clone;
364 370
365 prev = more; 371 parts.push_back (at);
366 }
367 372
368 if (!head->next) 373 if (f.kw != KW_more)
369 { 374 break;
370 head->next = first_archetype;
371 first_archetype = head;
372 }
373 375
374 return head; 376 f.next ();
375}
376 377
377/* 378 if (f.kw != KW_object)
378 * Reads/parses the archetype-file, and copies into a linked list
379 * of archetype-structures.
380 */
381static bool
382load_archetypes (object_thawer &f)
383{
384 for (;;)
385 {
386 switch (f.kw)
387 { 379 {
388 case KW_object: 380 f.parse_error ("more object");
389 loading_arch = true; 381 goto fail;
390 if (!archetype::read (f))
391 {
392 loading_arch = false;
393 return false;
394 }
395
396 loading_arch = false;
397 continue;
398
399 case KW_EOF:
400 return true;
401
402 default:
403 if (!f.parse_error ("archetypes file"))
404 return false;
405 } 382 }
406
407 f.next ();
408 } 383 }
409}
410 384
411/* 385 {
412 * First initialises the archtype hash-table (init_archetable()). 386 auto (at, parts.begin ());
413 * Reads and parses the archetype file (with the first and second-pass
414 * functions).
415 */
416bool
417load_archetype_file (const char *filename)
418{
419 object_thawer f (filename);
420 387
421 f.next (); 388 archetype *new_head = parts.front ();
389 archetype *old_head = find (new_head->archname);
422 390
423 // make sure the next - long - step is only done after a tick 391 if (old_head && !old_head->is_head ())
424 coroapi::wait_for_tick_begin ();
425
426 if (!load_archetypes (f))
427 return false;
428
429 warn_archetypes = 1;
430
431 empty_archetype = archetype::find ("empty_archetype");
432 if (!empty_archetype)
433 return false;
434
435 coroapi::cede ();
436
437 return true;
438}
439
440/*
441 * Creates and returns a new object which is a copy of the given archetype.
442 * This function returns NULL on failure.
443 */
444object *
445arch_to_object (archetype *at)
446{
447 if (!at)
448 { 392 {
449 if (warn_archetypes) 393 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
450 LOG (llevError, "Couldn't find archetype.\n"); 394 &new_head->archname, &old_head->archname);
451 395 goto fail;
452 return NULL;
453 } 396 }
454 397
398 // check that all archetypes belong to the same old object or are new
399 for (auto (at, parts.begin ()); at != parts.end (); ++at)
400 {
401 archetype *new_part = *at;
402 archetype *old_part = find (new_part->archname);
403
404 if (old_part && old_part->head_ () != old_head)
405 {
406 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
407 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
408 goto fail;
409 }
410 }
411
412 // assemble new chain
413 new_head->min_x = new_head->max_x = new_head->x;
414 new_head->min_y = new_head->max_y = new_head->y;
415
416 archetype *less = new_head;
417 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
418 {
419 archetype *at = *p;
420
421 // some flags get inherited from the head (probably a lot more)
422 // doing it here doesn't feel too cozy, but it allows code
423 // to ignore head checks for these flags, which saves time
424 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
425 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
426 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
427 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
428
429 new_head->min_x = min (new_head->min_x, at->x);
430 new_head->min_y = min (new_head->min_y, at->y);
431 new_head->max_x = max (new_head->max_x, at->x);
432 new_head->max_y = max (new_head->max_y, at->y);
433
434 at->head = new_head;
435 less->more = at;
436 less = at;
437 }
438
439 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
440
441 return new_head;
442 }
443
444fail:
445 for (auto (p, parts.begin ()); p != parts.end (); ++p)
446 (*p)->destroy ();
447
448 return 0;
449}
450
451void
452archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
453{
454 ref = 0;
455 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
456}
457
458void
459archetype::commit_load ()
460{
461 // unlink old archetypes and link in new ones */
462 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
463 {
464 archetype *at = *p;
465
466 if (archetype *old = find (at->archname))
467 old->unlink ();
468
469 allarch.push_back (at);
470
471 at->link ();
472 ++dirtycnt;
473 }
474
475 postponed_arch.clear ();
476
477 // now resolve arch references
478 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
479 {
480 arch_ptr *ap = p->first;
481 archetype *at = find (p->second);
482
483 if (!at)
484 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
485
486 *ap = at;
487 }
488
489 postponed_arch_ref.clear ();
490
491 empty = find (shstr_empty_archetype);
492}
493
494void
495archetype::gc ()
496{
497 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
498 dirtycnt = max (0, dirtycnt - cnt);
499
500 do
501 {
502 static int idx;
503
504 if (idx >= allarch.size ())
505 if (idx)
506 idx = 0;
507 else
508 return;
509
510 archetype *at = allarch [idx];
511
512 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
513 ++idx;
514 else
515 {
516 LOG (llevDebug, "garbage collect arch %s", &at->archname);
517 assert (at->arch == at); // verify that refcnt == 1 is truly valid
518 allarch.erase (idx);
519
520 // break chain
521 for (object *op = at->head_ (); op; )
522 {
523 object *next = op->more;
524 op->head = 0;
525 op->more = 0;
526 op = next;
527 }
528
529 at->destroy ();
530 at->arch = 0;
531 }
532 }
533 while (--cnt);
534}
535
536object *
537archetype::instance ()
538{
455 object *op = at->clone.clone (); 539 object *op = clone ();
456 op->arch = at;
457 op->instantiate (); 540 op->instantiate ();
458 return op; 541 return op;
459} 542}
460 543
461/* 544/*
465 * an object, and never NULL. 548 * an object, and never NULL.
466 */ 549 */
467object * 550object *
468create_singularity (const char *name) 551create_singularity (const char *name)
469{ 552{
470 object *op; 553 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
471 char buf[MAX_BUF];
472 554
473 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 555 if (!strcmp (name, "bug"))
474 op = object::create (); 556 abort ();
475 op->name = op->name_pl = buf; 557
476 SET_FLAG (op, FLAG_NO_PICK); 558 object *op = archetype::get (shstr_bug);
559 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
560
477 return op; 561 return op;
478} 562}
479 563
480/* 564/*
481 * Finds which archetype matches the given name, and returns a new 565 * Finds which archetype matches the given name, and returns a new
482 * object containing a copy of the archetype. 566 * object containing a copy of the archetype.
483 */ 567 */
484object * 568object *
485get_archetype (const char *name) 569get_archetype (const char *name)
486{ 570{
571 return archetype::get (name);
572}
573
574object *
575archetype::get (const char *name)
576{
487 archetype *at = archetype::find (name); 577 archetype *at = find (name);
488 578
489 if (!at) 579 if (!at)
490 return create_singularity (name); 580 return create_singularity (name);
491 581
492 return arch_to_object (at); 582 return at->instance ();
493}
494
495/*
496 * Hash-function used by the arch-hashtable.
497 */
498
499unsigned long
500hasharch (const char *str, int tablesize)
501{
502 unsigned long hash = 0;
503 unsigned int i = 0;
504 const char *p;
505
506 /* use the one-at-a-time hash function, which supposedly is
507 * better than the djb2-like one used by perl5.005, but
508 * certainly is better then the bug used here before.
509 * see http://burtleburtle.net/bob/hash/doobs.html
510 */
511 for (p = str; i < MAXSTRING && *p; p++, i++)
512 {
513 hash += *p;
514 hash += hash << 10;
515 hash ^= hash >> 6;
516 }
517
518 hash += hash << 3;
519 hash ^= hash >> 11;
520 hash += hash << 15;
521
522 return hash % tablesize;
523}
524
525/*
526 * Finds, using the hashtable, which archetype matches the given name.
527 * returns a pointer to the found archetype, otherwise NULL.
528 */
529archetype *
530archetype::find (const char *name)
531{
532 if (!name)
533 return 0;
534
535 AUTODECL (i, ht.find (name));
536
537 if (i == ht.end ())
538 return 0;
539 else
540 return i->second;
541}
542
543archetype *
544archetype::get (const char *name)
545{
546 archetype *at = find (name);
547
548 if (!at)
549 {
550 archetypes.push_back (at = new archetype);
551 at->name = name;
552 at->hash_add ();
553 }
554
555 return at;
556}
557
558/*
559 * Adds an archetype to the hashtable.
560 */
561void
562archetype::hash_add ()
563{
564 ht.insert (std::make_pair (name, this));
565}
566
567void
568archetype::hash_del ()
569{
570 ht.erase (name);
571} 583}
572 584
573/* 585/*
574 * Returns the first archetype using the given type. 586 * Returns the first archetype using the given type.
575 * Used in treasure-generation. 587 * Used in treasure-generation.
576 */ 588 */
577archetype * 589archetype *
578type_to_archetype (int type) 590type_to_archetype (int type)
579{ 591{
580 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 592 for_all_archetypes (at)
581 if (at->clone.type == type) 593 if (at->type == type && at->head_ () != at)
582 return at; 594 return at;
583 595
584 return 0; 596 return 0;
585} 597}
586 598
590 * Used in treasure-generation. 602 * Used in treasure-generation.
591 */ 603 */
592object * 604object *
593clone_arch (int type) 605clone_arch (int type)
594{ 606{
595 archetype *at; 607 archetype *at = type_to_archetype (type);
596 608
597 if ((at = type_to_archetype (type)) == NULL) 609 if (!at)
598 { 610 {
599 LOG (llevError, "Can't clone archetype %d\n", type); 611 LOG (llevError, "Can't clone archetype %d\n", type);
600 return 0; 612 return 0;
601 } 613 }
602 614
603 object *op = at->clone.clone (); 615 return at->instance ();
604 op->instantiate ();
605 return op;
606} 616}
607 617
608/* 618/*
609 * member: make instance from class 619 * member: make instance from class
610 */ 620 */
611
612object * 621object *
613object_create_arch (archetype *at) 622object_create_arch (archetype *at)
614{ 623{
615 object *op, *prev = 0, *head = 0; 624 object *op, *prev = 0, *head = 0;
616 625
617 while (at) 626 while (at)
618 { 627 {
619 op = arch_to_object (at); 628 op = at->instance ();
629
620 op->x = at->clone.x; 630 op->x = at->x;
621 op->y = at->clone.y; 631 op->y = at->y;
622 632
623 if (head) 633 if (head)
624 op->head = head, prev->more = op; 634 op->head = head, prev->more = op;
625 635
626 if (!head) 636 if (!head)
627 head = op; 637 head = op;
628 638
629 prev = op; 639 prev = op;
630 at = at->more; 640 at = (archetype *)at->more;
631 } 641 }
632 642
633 return (head); 643 return head;
634} 644}
635 645

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines