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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines