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.45 by root, Fri Apr 13 07:26:29 2007 UTC vs.
Revision 1.74 by root, Sun Apr 20 05:24:55 2008 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>
… …
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
34int arch_init; /* True if doing arch initialization */ 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
35 34arch_ptr archetype::empty;
36/* The naming of these functions is really poor - they are all
37 * pretty much named '.._arch_...', but they may more may not
38 * return archetypes. Some make the arch_to_object call, and thus
39 * return an object. Perhaps those should be called 'archob' functions
40 * to denote they return an object derived from the archetype.
41 * MSW 2003-04-29
42 */
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
54static std::vector<archetype *> postponed_arch;
55 55
56/** 56/**
57 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 58 * 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. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
67archetype * 67archetype *
68find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
69{ 69{
70 shstr_cmp name_cmp (name); 70 shstr_cmp name_cmp (name);
71 71
72 for (archetype *at = first_archetype; at; at = at->next) 72 for_all_archetypes (at)
73 if (at->clone.name == name_cmp) 73 if (at->name == name_cmp)
74 return at; 74 return at;
75 75
76 return 0; 76 return 0;
77} 77}
78 78
… …
84archetype * 84archetype *
85find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
86{ 86{
87 shstr_cmp name_cmp (name); 87 shstr_cmp name_cmp (name);
88 88
89 for (archetype *at = first_archetype; at; at = at->next) 89 for_all_archetypes (at)
90 if (at->clone.name == name_cmp && at->clone.type == type) 90 if (at->name == name_cmp && at->type == type)
91 return at; 91 return at;
92 92
93 return 0; 93 return 0;
94} 94}
95 95
… …
101object * 101object *
102get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
103{ 103{
104 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
105 105
106 for (archetype *at = first_archetype; at; at = at->next) 106 for_all_archetypes (at)
107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
108 return arch_to_object (at); 108 return arch_to_object (at);
109 109
110 return 0; 110 return 0;
111} 111}
112 112
… …
118 * (eg, skills) 118 * (eg, skills)
119 */ 119 */
120archetype * 120archetype *
121get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
122{ 122{
123 for (archetype *at = first_archetype; at; at = at->next) 123 for_all_archetypes (at)
124 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))
125 return at; 125 return at;
126 126
127 return 0; 127 return 0;
128} 128}
129 129
… …
156 } 156 }
157 157
158 return create_singularity (name); 158 return create_singularity (name);
159} 159}
160 160
161 /* 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
162 * a string seperated lists of things to match, with certain keywords. 162 * a string seperated lists of things to match, with certain keywords.
163 * pl is the player (only needed to set count properly) 163 * pl is the player (only needed to set count properly)
164 * 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
165 * 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
166 * (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
167 * value means a better match. 0 means no match. 167 * value means a better match. 0 means no match.
168 * 168 *
169 * Brief outline of the procedure: 169 * Brief outline of the procedure:
170 * We take apart the name variable into the individual components. 170 * We take apart the name variable into the individual components.
171 * cases for 'all' and unpaid are pretty obvious. 171 * cases for 'all' and unpaid are pretty obvious.
172 * 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
173 * player object.) 173 * player object.)
174 * If count is 1, make a quick check on the name. 174 * If count is 1, make a quick check on the name.
175 * 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.
176 * Last, make a check on the full name. 176 * Last, make a check on the full name.
177 */ 177 */
178int 178int
179item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
180{ 180{
181 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
182 int count, retval = 0; 182 int count, retval = 0;
… …
274 } 274 }
275 275
276 return 0; 276 return 0;
277} 277}
278 278
279/* 279archetype::archetype (const char *name)
280 * Initialises the internal linked list of archetypes (read from file). 280{
281 * Then the global "empty_archetype" pointer is initialised. 281 arch = this;
282 * Then the blocksview[] array is initialised. 282 this->archname = this->name = this->name_pl = name;
283 */ 283}
284
285archetype::~archetype ()
286{
287 unlink ();
288}
284 289
285void 290void
286init_archetypes (void) 291archetype::link ()
287{ /* called from add_player() and edit() */ 292{
288 if (first_archetype != NULL) /* Only do this once */ 293 if (!archetypes.contains (this))
289 return; 294 {
290 295 archetypes.insert (this);
291 arch_init = 1; 296 ht.insert (std::make_pair (archname, this));
292 load_archetypes (); 297 }
293 arch_init = 0;
294 empty_archetype = archetype::find ("empty_archetype");
295
296/* init_blocksview();*/
297} 298}
298 299
299/*
300 * An alternative way to init the hashtable which is slower, but _works_...
301 */
302void 300void
303init_archetable (void) 301archetype::unlink ()
304{ 302{
305 LOG (llevDebug, " Setting up archetable...\n"); 303 if (archetypes.contains (this))
306
307 for (archetype *at = first_archetype; at; at = at->next)
308 for (archetype *bt = at; bt; bt = bt->more)
309 bt->hash_add ();
310
311 LOG (llevDebug, "done\n");
312}
313
314void
315free_all_archs (void)
316{
317 archetype *at, *next;
318 int i = 0, f = 0;
319
320 for (at = first_archetype; at; at = next)
321 {
322 if (at->more)
323 next = at->more;
324 else
325 next = at->next;
326
327 delete
328 at;
329
330 i++;
331 } 304 {
332 305 archetypes.erase (this);
333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 306 ht.erase (archname);
307 }
334} 308}
335 309
336archetype::archetype () 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)
337{ 316{
338 clone.arch = this; 317 if (!name)
318 return 0;
339 319
340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 320 auto (i, ht.find (name));
341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
342}
343 321
344archetype::~archetype () 322 if (i == ht.end ())
345{ 323 return 0;
346 //TODO: nuke ->more's 324 else
325 return i->second;
347} 326}
348 327
349archetype * 328archetype *
350archetype::read (object_thawer &f) 329archetype::read (object_thawer &f)
351{ 330{
352 assert (f.kw == KW_object); 331 assert (f.kw == KW_object);
353 332
354 archetype *head = new archetype; 333 std::vector<archetype *> parts;
355 f.get (head->name);
356 334
357 if (!head->clone.parse_kv (f)) 335 coroapi::cede_to_tick ();
358 { 336
359 delete head; 337 for (;;)
360 return 0;
361 } 338 {
339 archetype *at = new archetype (f.get_str ());
362 340
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next (); 341 f.next ();
366 342
367 assert (f.kw == KW_object); 343#if 0
368 344 // implementing it here in the server does neither allow multiple inheritence
369 archetype *more = new archetype; 345 // nor does it cleanly "just override". it would allow use in map files, though,
370 f.get (more->name); 346 // and other resource files dynamically laoded (as opposed to being preprocessed).
371 347 // not that any of this is relevant as of yet...
372 if (!more->clone.parse_kv (f)) 348 if (f.kw == KW_inherit)
373 { 349 {
374 delete head; 350 if (archetype *at = find (f.get_str ()))
375 return 0; 351 *op = at->clone;
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 ();
376 } 357 }
358#endif
377 359
378 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 360 loading_arch = at; // hack to tell parse_kv et al. to behave
379 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 361 bool parse_ok = at->parse_kv (f);
362 loading_arch = 0;
380 363
381 more->head = head; 364 if (!parse_ok)
382 more->clone.head = &head->clone; 365 goto fail;
383 prev->more = more;
384 prev->clone.more = &more->clone;
385 366
386 prev = more; 367 loading_arch = at; // hack to tell parse_kv et al. to behave
387 } 368 at->post_load_check ();
369 loading_arch = 0;
388 370
389 head->next = first_archetype; 371 parts.push_back (at);
390 first_archetype = head;
391 372
392 return head; 373 if (f.kw != KW_more)
393} 374 break;
394 375
395/* 376 f.next ();
396 * Reads/parses the archetype-file, and copies into a linked list 377
397 * of archetype-structures. 378 if (f.kw != KW_object)
398 */
399static bool
400first_arch_pass (object_thawer &f)
401{
402 for (;;)
403 {
404 switch (f.kw)
405 { 379 {
406 case KW_object: 380 f.parse_error ("more object");
407 if (!archetype::read (f)) 381 goto fail;
408 return false;
409 continue;
410
411 case KW_EOF:
412 return true;
413
414 default:
415 if (!f.parse_error ("archetypes file"))
416 return false;
417 } 382 }
383 }
418 384
419 f.next (); 385 {
386 auto (at, parts.begin ());
387
388 archetype *new_head = parts.front ();
389 archetype *old_head = find (new_head->archname);
390
391 if (old_head && !old_head->is_head ())
392 {
393 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
394 &new_head->archname, &old_head->archname);
395 goto fail;
420 } 396 }
421}
422 397
423/* 398 // check that all archetypes belong to the same old object or are new
424 * Reads the archetype file once more, and links all pointers between 399 for (auto (at, parts.begin ()); at != parts.end (); ++at)
425 * archetypes. 400 {
426 */ 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 (true);
447
448 return 0;
449}
450
427void 451void
428second_arch_pass (object_thawer & thawer) 452archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
429{ 453{
430 char buf[MAX_BUF], *variable = buf, *argument, *cp; 454 ref = 0;
431 archetype *at = NULL, *other; 455 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
456}
432 457
433 while (fgets (buf, MAX_BUF, thawer) != NULL) 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;
434 { 473 }
435 if (*buf == '#')
436 continue;
437 474
438 if ((argument = strchr (buf, ' ')) != NULL) 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
439 { 515 {
440 *argument = '\0', argument++; 516 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
441 cp = argument + strlen (argument) - 1; 517 assert (at->arch == at); // verify that refcnt == 1 is truely valid
442 while (isspace (*cp)) 518 allarch.erase (idx);
443 { 519 at->arch = 0;
444 *cp = '\0'; 520 at->more = 0;
445 cp--; 521 at->destroy ();
446 }
447 } 522 }
448
449 if (!strcmp ("object", variable))
450 {
451 if ((at = archetype::find (argument)) == NULL)
452 LOG (llevError, "Warning: failed to find arch %s\n", argument);
453 }
454 else if (!strcmp ("other_arch", variable))
455 {
456 if (at != NULL && at->clone.other_arch == NULL)
457 {
458 if ((other = archetype::find (argument)) == NULL)
459 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
460 else if (at != NULL)
461 at->clone.other_arch = other;
462 }
463 }
464 else if (!strcmp ("randomitems", variable))
465 {
466 if (at)
467 {
468 treasurelist *tl = find_treasurelist (argument);
469
470 if (tl == NULL)
471 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
472 else
473 at->clone.randomitems = tl;
474 }
475 }
476 }
477}
478
479/*
480 * First initialises the archtype hash-table (init_archetable()).
481 * Reads and parses the archetype file (with the first and second-pass
482 * functions).
483 * Then initialises treasures by calling load_treasures().
484 */
485void
486load_archetypes (void)
487{
488 char filename[MAX_BUF];
489
490 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
491 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
492
493 {
494 object_thawer f (filename);
495
496 f.next ();
497
498 LOG (llevDebug, " arch-pass 1...\n");
499 if (!first_arch_pass (f))
500 cleanup ("errors during first arch pass are fatal");
501 LOG (llevDebug, " done\n");
502 } 523 }
503 524 while (--cnt);
504 init_archetable ();
505 warn_archetypes = 1;
506
507 {
508 object_thawer f (filename);
509
510 LOG (llevDebug, " loading treasure...\n");
511 load_treasures ();
512 LOG (llevDebug, " done\n");
513 LOG (llevDebug, " arch-pass 2...\n");
514 second_arch_pass (f);
515 LOG (llevDebug, " done\n");
516 }
517 LOG (llevDebug, " done\n");
518} 525}
519 526
520/* 527/*
521 * Creates and returns a new object which is a copy of the given archetype. 528 * Creates and returns a new object which is a copy of the given archetype.
522 * This function returns NULL on failure. 529 * This function returns NULL on failure.
… …
524object * 531object *
525arch_to_object (archetype *at) 532arch_to_object (archetype *at)
526{ 533{
527 if (!at) 534 if (!at)
528 { 535 {
529 if (warn_archetypes)
530 LOG (llevError, "Couldn't find archetype.\n"); 536 LOG (llevError, "Couldn't find archetype.\n");
531
532 return NULL; 537 return 0;
533 } 538 }
534 539
535 object *op = at->clone.clone (); 540 object *op = at->clone ();
536 op->arch = at; 541 op->arch = at;
537 op->instantiate (); 542 op->instantiate ();
543
538 return op; 544 return op;
545}
546
547object *
548archetype::instance ()
549{
550 return arch_to_object (this);
539} 551}
540 552
541/* 553/*
542 * Creates an object. This function is called by get_archetype() 554 * Creates an object. This function is called by get_archetype()
543 * if it fails to find the appropriate archetype. 555 * if it fails to find the appropriate archetype.
… …
545 * an object, and never NULL. 557 * an object, and never NULL.
546 */ 558 */
547object * 559object *
548create_singularity (const char *name) 560create_singularity (const char *name)
549{ 561{
550 object *op; 562 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
563
564 if (!strcmp (name, "bug"))
565 abort ();
566
551 char buf[MAX_BUF]; 567 char buf[MAX_BUF];
568 sprintf (buf, "bug, please report (%s)", name);
552 569
553 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 570 object *op = get_archetype ("bug");
554 op = object::create ();
555 op->name = op->name_pl = buf; 571 op->name = op->name_pl = buf;
556 SET_FLAG (op, FLAG_NO_PICK); 572
557 return op; 573 return op;
558} 574}
559 575
560/* 576/*
561 * Finds which archetype matches the given name, and returns a new 577 * Finds which archetype matches the given name, and returns a new
… …
571 587
572 return arch_to_object (at); 588 return arch_to_object (at);
573} 589}
574 590
575/* 591/*
576 * Hash-function used by the arch-hashtable.
577 */
578
579unsigned long
580hasharch (const char *str, int tablesize)
581{
582 unsigned long hash = 0;
583 unsigned int i = 0;
584 const char *p;
585
586 /* use the one-at-a-time hash function, which supposedly is
587 * better than the djb2-like one used by perl5.005, but
588 * certainly is better then the bug used here before.
589 * see http://burtleburtle.net/bob/hash/doobs.html
590 */
591 for (p = str; i < MAXSTRING && *p; p++, i++)
592 {
593 hash += *p;
594 hash += hash << 10;
595 hash ^= hash >> 6;
596 }
597
598 hash += hash << 3;
599 hash ^= hash >> 11;
600 hash += hash << 15;
601
602 return hash % tablesize;
603}
604
605/*
606 * Finds, using the hashtable, which archetype matches the given name.
607 * returns a pointer to the found archetype, otherwise NULL.
608 */
609archetype *
610archetype::find (const char *name)
611{
612 if (!name)
613 return 0;
614
615 AUTODECL (i, ht.find (name));
616
617 if (i == ht.end ())
618 return 0;
619 else
620 return i->second;
621}
622
623/*
624 * Adds an archetype to the hashtable.
625 */
626void
627archetype::hash_add ()
628{
629 ht.insert (std::make_pair (name, this));
630}
631
632void
633archetype::hash_del ()
634{
635 ht.erase (name);
636}
637
638/*
639 * Returns the first archetype using the given type. 592 * Returns the first archetype using the given type.
640 * Used in treasure-generation. 593 * Used in treasure-generation.
641 */ 594 */
642archetype * 595archetype *
643type_to_archetype (int type) 596type_to_archetype (int type)
644{ 597{
645 archetype *at; 598 for_all_archetypes (at)
646 599 if (at->type == type && at->head_ () != at)
647 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
648 if (at->clone.type == type)
649 return at; 600 return at;
650 601
651 return 0; 602 return 0;
652} 603}
653 604
654/* 605/*
655 * Returns a new object copied from the first archetype matching 606 * Returns a new object copied from the first archetype matching
656 * the given type. 607 * the given type.
657 * Used in treasure-generation. 608 * Used in treasure-generation.
658 */ 609 */
659
660object * 610object *
661clone_arch (int type) 611clone_arch (int type)
662{ 612{
663 archetype *at; 613 archetype *at;
664 614
… …
666 { 616 {
667 LOG (llevError, "Can't clone archetype %d\n", type); 617 LOG (llevError, "Can't clone archetype %d\n", type);
668 return 0; 618 return 0;
669 } 619 }
670 620
671 object *op = at->clone.clone (); 621 object *op = at->clone ();
672 op->instantiate (); 622 op->instantiate ();
673 return op; 623 return op;
674} 624}
675 625
676/* 626/*
677 * member: make instance from class 627 * member: make instance from class
678 */ 628 */
679
680object * 629object *
681object_create_arch (archetype *at) 630object_create_arch (archetype *at)
682{ 631{
683 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
684 633
685 while (at) 634 while (at)
686 { 635 {
687 op = arch_to_object (at); 636 op = arch_to_object (at);
637
688 op->x = at->clone.x; 638 op->x = at->x;
689 op->y = at->clone.y; 639 op->y = at->y;
690 640
691 if (head) 641 if (head)
692 op->head = head, prev->more = op; 642 op->head = head, prev->more = op;
693 643
694 if (!head) 644 if (!head)
695 head = op; 645 head = op;
696 646
697 prev = op; 647 prev = op;
698 at = at->more; 648 at = (archetype *)at->more;
699 } 649 }
700 650
701 return (head); 651 return head;
702} 652}
703 653

Diff Legend

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