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.58 by root, Sat Apr 21 11:55:36 2007 UTC vs.
Revision 1.87 by root, Thu Jan 1 11:41:17 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
28#include <funcpoint.h>
29#include <loader.h> 27#include <loader.h>
30 28
31#include <tr1/functional> 29#include <tr1/functional>
32#include <tr1/unordered_map> 30#include <tr1/unordered_map>
33 31
34/* The naming of these functions is really poor - they are all
35 * pretty much named '.._arch_...', but they may more may not
36 * return archetypes. Some make the arch_to_object call, and thus
37 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29
40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
33arch_ptr archetype::empty;
43 34
44// the hashtable 35// the hashtable
45typedef std::tr1::unordered_map 36typedef std::tr1::unordered_map
46 < 37 <
47 const char *, 38 const char *,
… …
49 str_hash, 40 str_hash,
50 str_equal, 41 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 42 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 43 > HT;
53 44
54static HT ht (5000); 45static HT ht (10000);
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
55static std::vector<archetype *> archetypes; 53static std::vector<archetype *> postponed_arch;
56 54
57/** 55/**
58 * GROS - This function retrieves an archetype given the name that appears 56 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 57 * during the game (for example, "writing pen" instead of "stylus").
60 * It does not use the hashtable system, but browse the whole archlist each time. 58 * It does not use the hashtable system, but browse the whole archlist each time.
… …
68archetype * 66archetype *
69find_archetype_by_object_name (const char *name) 67find_archetype_by_object_name (const char *name)
70{ 68{
71 shstr_cmp name_cmp (name); 69 shstr_cmp name_cmp (name);
72 70
73 for (archetype *at = first_archetype; at; at = at->next) 71 for_all_archetypes (at)
74 if (at->clone.name == name_cmp) 72 if (at->name == name_cmp)
75 return at; 73 return at;
76 74
77 return 0; 75 return 0;
78} 76}
79 77
… …
85archetype * 83archetype *
86find_archetype_by_object_type_name (int type, const char *name) 84find_archetype_by_object_type_name (int type, const char *name)
87{ 85{
88 shstr_cmp name_cmp (name); 86 shstr_cmp name_cmp (name);
89 87
90 for (archetype *at = first_archetype; at; at = at->next) 88 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.type == type) 89 if (at->name == name_cmp && at->type == type)
92 return at; 90 return at;
93 91
94 return 0; 92 return 0;
95} 93}
96 94
… …
102object * 100object *
103get_archetype_by_skill_name (const char *skill, int type) 101get_archetype_by_skill_name (const char *skill, int type)
104{ 102{
105 shstr_cmp skill_cmp (skill); 103 shstr_cmp skill_cmp (skill);
106 104
107 for (archetype *at = first_archetype; at; at = at->next) 105 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 106 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 107 return at->instance ();
110 108
111 return 0; 109 return 0;
112} 110}
113 111
114/* similiar to above - this returns the first archetype 112/* similiar to above - this returns the first archetype
… …
119 * (eg, skills) 117 * (eg, skills)
120 */ 118 */
121archetype * 119archetype *
122get_archetype_by_type_subtype (int type, int subtype) 120get_archetype_by_type_subtype (int type, int subtype)
123{ 121{
124 for (archetype *at = first_archetype; at; at = at->next) 122 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 123 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 124 return at;
127 125
128 return 0; 126 return 0;
129} 127}
130 128
… …
135 * - name: The name we're searching for (ex: "writing pen"); 133 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 134 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 135 * - a corresponding object if found; a singularity object if not found.
138 * Note by MSW - it appears that it takes the full name and keeps 136 * Note by MSW - it appears that it takes the full name and keeps
139 * shortening it until it finds a match. I re-wrote this so that it 137 * shortening it until it finds a match. I re-wrote this so that it
140 * doesn't malloc it each time - not that this function is used much, 138 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 139 * but it otherwise had a big memory leak.
142 */ 140 */
143object * 141object *
144get_archetype_by_object_name (const char *name) 142get_archetype_by_object_name (const char *name)
145{ 143{
… …
151 for (i = strlen (tmpname); i > 0; i--) 149 for (i = strlen (tmpname); i > 0; i--)
152 { 150 {
153 tmpname[i] = 0; 151 tmpname[i] = 0;
154 152
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 153 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 154 return at->instance ();
157 } 155 }
158 156
159 return create_singularity (name); 157 return create_singularity (name);
160} 158}
161 159
162 /* This is a subset of the parse_id command. Basically, name can be 160/* 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. 161 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 162 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 163 * 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 164 * 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 165 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 166 * value means a better match. 0 means no match.
169 * 167 *
170 * Brief outline of the procedure: 168 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 169 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 170 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 171 * Next, we check for a count (either specified in name, or in the
174 * player object.) 172 * player object.)
175 * If count is 1, make a quick check on the name. 173 * 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. 174 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 175 * Last, make a check on the full name.
178 */ 176 */
179int 177int
180item_matched_string (object *pl, object *op, const char *name) 178item_matched_string (object *pl, object *op, const char *name)
181{ 179{
182 char *cp, local_name[MAX_BUF]; 180 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 181 int count, retval = 0;
… …
260 retval = 6; 258 retval = 6;
261 /* base name matched - not bad */ 259 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 260 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 261 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 262 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 263 else if (op->custom_name && op->custom_name.contains (cp))
266 retval = 3; 264 retval = 3;
267 265
268 if (retval) 266 if (retval)
269 { 267 {
270 if (pl->type == PLAYER) 268 if (pl->type == PLAYER)
… …
275 } 273 }
276 274
277 return 0; 275 return 0;
278} 276}
279 277
280archetype::archetype () 278archetype::archetype (const char *name)
281{ 279{
282 clone.arch = this; 280 arch = this;
283 281 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} 282}
287 283
288archetype::~archetype () 284archetype::~archetype ()
289{ 285{
290 //TODO: nuke ->more's 286 unlink ();
291} 287}
292 288
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 289void
311overwrite (archetype *at, object *op) 290archetype::link ()
312{ 291{
313 at->clone = *op; 292 if (!archetypes.contains (this))
314 at->clone.arch = at; 293 {
294 archetypes.insert (this);
295 ht.insert (std::make_pair (archname, this));
296 }
297}
315 298
316 at->clone.inv = op->inv; op->inv = 0; 299void
300archetype::unlink ()
301{
302 if (archetypes.contains (this))
303 {
304 archetypes.erase (this);
305 ht.erase (archname);
306 }
307}
317 308
318 op->destroy (); 309/*
310 * Finds, using the hashtable, which archetype matches the given name.
311 * returns a pointer to the found archetype, otherwise NULL.
312 */
313archetype *
314archetype::find (const char *name)
315{
316 if (!name)
317 return 0;
318
319 auto (i, ht.find (name));
320
321 if (i == ht.end ())
322 return 0;
323 else
324 return i->second;
319} 325}
320 326
321archetype * 327archetype *
322archetype::read (object_thawer &f) 328archetype::read (object_thawer &f)
323{ 329{
324 assert (f.kw == KW_object); 330 assert (f.kw == KW_object);
325 331
326 loading_arch = true; // hack to tell parse_kv et al. to behave
327
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts; 332 std::vector<archetype *> parts;
330 333
331 coroapi::cede_to_tick_every (100); 334 coroapi::cede_to_tick ();
332 335
333 for (;;) 336 for (;;)
334 { 337 {
335 object *op = object::create ();
336 archetype *at = get (f.get_str ()); 338 archetype *at = new archetype (f.get_str ());
337 f.get (op->name); 339
338 f.next (); 340 f.next ();
339 341
340#if 0 342#if 0
343 // implementing it here in the server does neither allow multiple inheritence
344 // nor does it cleanly "just override". it would allow use in map files, though,
345 // and other resource files dynamically laoded (as opposed to being preprocessed).
346 // not that any of this is relevant as of yet...
341 if (f.kw == KW_inherit) 347 if (f.kw == KW_inherit)
342 { 348 {
343 if (archetype *at = find (f.get_str ())) 349 if (archetype *at = find (f.get_str ()))
344 *op = at->clone; 350 *op = at->clone;
345 else 351 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", 352 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ()); 353 &at->archname, f.get_str ());
348 354
349 f.next (); 355 f.next ();
350 } 356 }
351#endif 357#endif
352 358
359 loading_arch = at; // hack to tell parse_kv et al. to behave
360 bool parse_ok = at->parse_kv (f);
361 loading_arch = 0;
362
353 if (!op->parse_kv (f)) 363 if (!parse_ok)
354 goto fail; 364 goto fail;
355 365
356 parts.push_back (std::make_pair (at, op)); 366 loading_arch = at; // hack to tell parse_kv et al. to behave
367 at->post_load_check ();
368 loading_arch = 0;
369
370 parts.push_back (at);
357 371
358 if (f.kw != KW_more) 372 if (f.kw != KW_more)
359 break; 373 break;
360 374
361 f.next (); 375 f.next ();
… …
366 goto fail; 380 goto fail;
367 } 381 }
368 } 382 }
369 383
370 { 384 {
385 auto (at, parts.begin ());
386
371 archetype *head = parts.front ().first; 387 archetype *new_head = parts.front ();
388 archetype *old_head = find (new_head->archname);
372 389
373 // check that all archetypes belong to the same object or are heads 390 if (old_head && !old_head->is_head ())
374 for (auto (p, parts.begin ()); p != parts.end (); ++p)
375 { 391 {
376 archetype *at = p->first; 392 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
393 &new_head->archname, &old_head->archname);
394 goto fail;
395 }
377 396
378 if (at->head != head && at->head) 397 // check that all archetypes belong to the same old object or are new
398 for (auto (at, parts.begin ()); at != parts.end (); ++at)
399 {
400 archetype *new_part = *at;
401 archetype *old_part = find (new_part->archname);
402
403 if (old_part && old_part->head_ () != old_head)
379 { 404 {
380 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 405 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
381 goto fail; 406 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
382 }
383
384 if (at->next && at != head)
385 {
386 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
387 goto fail; 407 goto fail;
388 } 408 }
389 } 409 }
390 410
391 // sever chain of existing head object
392 for (archetype *more, *at = head; at; at = more)
393 {
394 more = at->more;
395
396 at->head = 0;
397 at->more = 0;
398 }
399
400 // replace/update head
401 overwrite (head, parts.front ().second);
402 head->tail_x = 0;
403 head->tail_y = 0;
404
405 // link into list of heads, if not already there
406 if (!head->linked)
407 {
408 head->linked = true;
409 head->next = first_archetype;
410 first_archetype = head;
411 }
412
413 // reassemble new chain 411 // assemble new chain
412 new_head->min_x = new_head->max_x = new_head->x;
413 new_head->min_y = new_head->max_y = new_head->y;
414
414 archetype *prev = head; 415 archetype *less = new_head;
415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 416 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
416 { 417 {
417 archetype *at = p->first; 418 archetype *at = *p;
418 overwrite (at, p->second);
419 419
420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 420 // some flags get inherited from the head (probably a lot more)
421 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 421 // doing it here doesn't feel too cozy, but it allows code
422 // to ignore head checks for these flags, which saves time
423 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
424 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
425 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
426 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
422 427
428 new_head->min_x = min (new_head->min_x, at->x);
429 new_head->min_y = min (new_head->min_y, at->y);
430 new_head->max_x = max (new_head->max_x, at->x);
431 new_head->max_y = max (new_head->max_y, at->y);
432
423 at->head = head; 433 at->head = new_head;
424 at->clone.head = &head->clone;
425 prev->more = at; 434 less->more = at;
426 prev->clone.more = &at->clone;
427
428 prev = at; 435 less = at;
429 } 436 }
430 437
431 loading_arch = false; 438 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
439
432 return head; 440 return new_head;
433 } 441 }
434 442
435fail: 443fail:
436 for (auto (p, parts.begin ()); p != parts.end (); ++p) 444 for (auto (p, parts.begin ()); p != parts.end (); ++p)
437 p->second->destroy (true); 445 (*p)->destroy ();
438 446
439 loading_arch = false;
440 return 0; 447 return 0;
441} 448}
442 449
443/*
444 * Initialize global archtype pointers:
445 */
446void 450void
447init_archetype_pointers () 451archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
448{ 452{
449 ring_arch = archetype::find ("ring"); 453 ref = 0;
450 amulet_arch = archetype::find ("amulet"); 454 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
451 staff_arch = archetype::find ("staff");
452 crown_arch = archetype::find ("crown");
453 empty_archetype = archetype::find ("empty_archetype");
454} 455}
455 456
456/* 457void
457 * Creates and returns a new object which is a copy of the given archetype. 458archetype::commit_load ()
458 * This function returns NULL on failure.
459 */
460object *
461arch_to_object (archetype *at)
462{ 459{
460 // unlink old archetypes and link in new ones */
461 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
462 {
463 archetype *at = *p;
464
465 if (archetype *old = find (at->archname))
466 old->unlink ();
467
468 allarch.push_back (at);
469
470 at->link ();
471 ++dirtycnt;
472 }
473
474 postponed_arch.clear ();
475
476 // now resolve arch references
477 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
478 {
479 arch_ptr *ap = p->first;
480 archetype *at = find (p->second);
481
463 if (!at) 482 if (!at)
483 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
484
485 *ap = at;
464 { 486 }
465 LOG (llevError, "Couldn't find archetype.\n"); 487
488 postponed_arch_ref.clear ();
489
490 empty = find (shstr_empty_archetype);
491}
492
493void
494archetype::gc ()
495{
496 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
497 dirtycnt = max (0, dirtycnt - cnt);
498
499 do
500 {
501 static int idx;
502
503 if (idx >= allarch.size ())
504 if (idx)
505 idx = 0;
506 else
466 return 0; 507 return;
467 }
468 508
509 archetype *at = allarch [idx];
510
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx;
513 else
514 {
515 LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx);
518
519 // break chain
520 for (object *op = at->head_ (); op; )
521 {
522 object *next = op->more;
523 op->head = 0;
524 op->more = 0;
525 op = next;
526 }
527
528 at->destroy ();
529 at->arch = 0;
530 }
531 }
532 while (--cnt);
533}
534
535object *
536archetype::instance ()
537{
469 object *op = at->clone.clone (); 538 object *op = clone ();
470 op->arch = at;
471 op->instantiate (); 539 op->instantiate ();
472
473 return op; 540 return op;
474} 541}
475 542
476/* 543/*
477 * Creates an object. This function is called by get_archetype() 544 * Creates an object. This function is called by get_archetype()
… …
480 * an object, and never NULL. 547 * an object, and never NULL.
481 */ 548 */
482object * 549object *
483create_singularity (const char *name) 550create_singularity (const char *name)
484{ 551{
485 object *op; 552 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
486 char buf[MAX_BUF];
487 553
488 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 554 if (!strcmp (name, "bug"))
489 op = object::create (); 555 abort ();
490 op->name = op->name_pl = buf; 556
491 SET_FLAG (op, FLAG_NO_PICK); 557 object *op = archetype::get (shstr_bug);
558 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
559
492 return op; 560 return op;
493} 561}
494 562
495/* 563/*
496 * Finds which archetype matches the given name, and returns a new 564 * Finds which archetype matches the given name, and returns a new
497 * object containing a copy of the archetype. 565 * object containing a copy of the archetype.
498 */ 566 */
499object * 567object *
500get_archetype (const char *name) 568get_archetype (const char *name)
501{ 569{
570 return archetype::get (name);
571}
572
573object *
574archetype::get (const char *name)
575{
502 archetype *at = archetype::find (name); 576 archetype *at = find (name);
503 577
504 if (!at) 578 if (!at)
505 return create_singularity (name); 579 return create_singularity (name);
506 580
507 return arch_to_object (at); 581 return at->instance ();
508}
509
510/*
511 * Finds, using the hashtable, which archetype matches the given name.
512 * returns a pointer to the found archetype, otherwise NULL.
513 */
514archetype *
515archetype::find (const char *name)
516{
517 if (!name)
518 return 0;
519
520 auto (i, ht.find (name));
521
522 if (i == ht.end ())
523 return 0;
524 else
525 return i->second;
526}
527
528archetype *
529archetype::get (const char *name)
530{
531 if (!name)
532 {
533 LOG (llevError, "null archetype requested\n");
534 name = "(null)";
535 }
536
537 archetype *at = find (name);
538
539 if (!at)
540 {
541 archetypes.push_back (at = new archetype);
542 at->name = at->clone.name = at->clone.name_pl = name;
543 at->hash_add ();
544 }
545
546 return at;
547}
548
549/*
550 * Adds an archetype to the hashtable.
551 */
552void
553archetype::hash_add ()
554{
555 ht.insert (std::make_pair (name, this));
556}
557
558void
559archetype::hash_del ()
560{
561 ht.erase (name);
562} 582}
563 583
564/* 584/*
565 * Returns the first archetype using the given type. 585 * Returns the first archetype using the given type.
566 * Used in treasure-generation. 586 * Used in treasure-generation.
567 */ 587 */
568archetype * 588archetype *
569type_to_archetype (int type) 589type_to_archetype (int type)
570{ 590{
571 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 591 for_all_archetypes (at)
572 if (at->clone.type == type) 592 if (at->type == type && at->head_ () != at)
573 return at; 593 return at;
574 594
575 return 0; 595 return 0;
576} 596}
577 597
… …
581 * Used in treasure-generation. 601 * Used in treasure-generation.
582 */ 602 */
583object * 603object *
584clone_arch (int type) 604clone_arch (int type)
585{ 605{
586 archetype *at; 606 archetype *at = type_to_archetype (type);
587 607
588 if ((at = type_to_archetype (type)) == NULL) 608 if (!at)
589 { 609 {
590 LOG (llevError, "Can't clone archetype %d\n", type); 610 LOG (llevError, "Can't clone archetype %d\n", type);
591 return 0; 611 return 0;
592 } 612 }
593 613
594 object *op = at->clone.clone (); 614 return at->instance ();
595 op->instantiate ();
596 return op;
597} 615}
598 616
599/* 617/*
600 * member: make instance from class 618 * member: make instance from class
601 */ 619 */
602
603object * 620object *
604object_create_arch (archetype *at) 621object_create_arch (archetype *at)
605{ 622{
606 object *op, *prev = 0, *head = 0; 623 object *op, *prev = 0, *head = 0;
607 624
608 while (at) 625 while (at)
609 { 626 {
610 op = arch_to_object (at); 627 op = at->instance ();
628
611 op->x = at->clone.x; 629 op->x = at->x;
612 op->y = at->clone.y; 630 op->y = at->y;
613 631
614 if (head) 632 if (head)
615 op->head = head, prev->more = op; 633 op->head = head, prev->more = op;
616 634
617 if (!head) 635 if (!head)
618 head = op; 636 head = op;
619 637
620 prev = op; 638 prev = op;
621 at = at->more; 639 at = (archetype *)at->more;
622 } 640 }
623 641
624 return (head); 642 return head;
625} 643}
626 644

Diff Legend

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