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.43 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.79 by root, Sun May 4 11:12:40 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
134 * - name: The name we're searching for (ex: "writing pen"); 133 * - name: The name we're searching for (ex: "writing pen");
135 * Return value: 134 * Return value:
136 * - a corresponding object if found; a singularity object if not found. 135 * - a corresponding object if found; a singularity object if not found.
137 * Note by MSW - it appears that it takes the full name and keeps 136 * Note by MSW - it appears that it takes the full name and keeps
138 * shortening it until it finds a match. I re-wrote this so that it 137 * shortening it until it finds a match. I re-wrote this so that it
139 * doesn't malloc it each time - not that this function is used much, 138 * doesn't allocate it each time - not that this function is used much,
140 * but it otherwise had a big memory leak. 139 * but it otherwise had a big memory leak.
141 */ 140 */
142object * 141object *
143get_archetype_by_object_name (const char *name) 142get_archetype_by_object_name (const char *name)
144{ 143{
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{
305 LOG (llevDebug, " Setting up archetable...\n"); 302 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 } 303 {
332 304 archetypes.erase (this);
333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 305 ht.erase (archname);
306 }
334} 307}
335 308
336archetype::archetype () 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)
337{ 315{
338 clone.arch = this; 316 if (!name)
317 return 0;
339 318
340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 319 auto (i, ht.find (name));
341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
342}
343 320
344archetype::~archetype () 321 if (i == ht.end ())
345{ 322 return 0;
346 //TODO: nuke ->more's 323 else
324 return i->second;
347} 325}
348 326
349archetype * 327archetype *
350archetype::read (object_thawer &f) 328archetype::read (object_thawer &f)
351{ 329{
352 assert (f.kw == KW_object); 330 assert (f.kw == KW_object);
353 331
354 archetype *head = new archetype; 332 std::vector<archetype *> parts;
355 f.get (head->name);
356 333
357 if (!head->clone.parse_kv (f)) 334 coroapi::cede_to_tick ();
358 { 335
359 delete head; 336 for (;;)
360 return 0;
361 } 337 {
338 archetype *at = new archetype (f.get_str ());
362 339
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next (); 340 f.next ();
366 341
367 assert (f.kw == KW_object); 342#if 0
368 343 // implementing it here in the server does neither allow multiple inheritence
369 archetype *more = new archetype; 344 // nor does it cleanly "just override". it would allow use in map files, though,
370 f.get (more->name); 345 // and other resource files dynamically laoded (as opposed to being preprocessed).
371 346 // not that any of this is relevant as of yet...
372 if (!more->clone.parse_kv (f)) 347 if (f.kw == KW_inherit)
373 { 348 {
374 delete head; 349 if (archetype *at = find (f.get_str ()))
375 return 0; 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 ();
376 } 356 }
357#endif
377 358
378 assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face)); 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;
379 362
380 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 363 if (!parse_ok)
381 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 364 goto fail;
382 365
383 more->head = head; 366 loading_arch = at; // hack to tell parse_kv et al. to behave
384 more->clone.head = &head->clone; 367 at->post_load_check ();
385 prev->more = more; 368 loading_arch = 0;
386 prev->clone.more = &more->clone;
387 369
388 prev = more; 370 parts.push_back (at);
389 }
390 371
391 head->next = first_archetype; 372 if (f.kw != KW_more)
392 first_archetype = head; 373 break;
393 374
394 return head; 375 f.next ();
395}
396 376
397/* 377 if (f.kw != KW_object)
398 * Reads/parses the archetype-file, and copies into a linked list
399 * of archetype-structures.
400 */
401static bool
402first_arch_pass (object_thawer &f)
403{
404 for (;;)
405 {
406 switch (f.kw)
407 { 378 {
408 case KW_object: 379 f.parse_error ("more object");
409 if (!archetype::read (f)) 380 goto fail;
410 return false;
411 continue;
412
413 case KW_EOF:
414 return true;
415
416 default:
417 if (!f.parse_error ("archetypes file"))
418 return false;
419 } 381 }
382 }
420 383
421 f.next (); 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;
422 } 395 }
423}
424 396
425/* 397 // check that all archetypes belong to the same old object or are new
426 * Reads the archetype file once more, and links all pointers between 398 for (auto (at, parts.begin ()); at != parts.end (); ++at)
427 * archetypes. 399 {
428 */ 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;
448}
449
429void 450void
430second_arch_pass (object_thawer & thawer) 451archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
431{ 452{
432 char buf[MAX_BUF], *variable = buf, *argument, *cp; 453 ref = 0;
433 archetype *at = NULL, *other; 454 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
455}
434 456
435 while (fgets (buf, MAX_BUF, thawer) != NULL) 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 {
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;
436 { 472 }
437 if (*buf == '#')
438 continue;
439 473
440 if ((argument = strchr (buf, ' ')) != NULL) 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
482 if (!at)
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;
513 else
441 { 514 {
442 *argument = '\0', argument++; 515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
443 cp = argument + strlen (argument) - 1; 516 assert (at->arch == at); // verify that refcnt == 1 is truly valid
444 while (isspace (*cp)) 517 allarch.erase (idx);
518
519 // break chain
520 for (object *op = at->head_ (); op; )
445 { 521 {
522 object *next = op->more;
523 op->head = 0;
524 op->more = 0;
446 *cp = '\0'; 525 op = next;
447 cp--;
448 } 526 }
527
528 at->destroy ();
529 at->arch = 0;
449 } 530 }
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)
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 f (filename);
510
511 f.next ();
512
513 LOG (llevDebug, " arch-pass 1...\n");
514 if (!first_arch_pass (f))
515 cleanup ("errors during first arch pass are fatal");
516 LOG (llevDebug, " done\n");
517 } 531 }
518 532 while (--cnt);
519 init_archetable ();
520 warn_archetypes = 1;
521
522 {
523 object_thawer f (filename);
524
525 LOG (llevDebug, " loading treasure...\n");
526 load_treasures ();
527 LOG (llevDebug, " done\n");
528 LOG (llevDebug, " arch-pass 2...\n");
529 second_arch_pass (f);
530 LOG (llevDebug, " done\n");
531#ifdef DEBUG
532 check_generators ();
533#endif
534 }
535 LOG (llevDebug, " done\n");
536} 533}
537 534
538/* 535/*
539 * Creates and returns a new object which is a copy of the given archetype. 536 * Creates and returns a new object which is a copy of the given archetype.
540 * This function returns NULL on failure. 537 * This function returns NULL on failure.
542object * 539object *
543arch_to_object (archetype *at) 540arch_to_object (archetype *at)
544{ 541{
545 if (!at) 542 if (!at)
546 { 543 {
547 if (warn_archetypes)
548 LOG (llevError, "Couldn't find archetype.\n"); 544 LOG (llevError, "Couldn't find archetype.\n");
549
550 return NULL; 545 return 0;
551 } 546 }
552 547
553 object *op = at->clone.clone (); 548 object *op = at->clone ();
554 op->arch = at; 549 op->arch = at;
555 op->instantiate (); 550 op->instantiate ();
551
556 return op; 552 return op;
553}
554
555object *
556archetype::instance ()
557{
558 return arch_to_object (this);
557} 559}
558 560
559/* 561/*
560 * Creates an object. This function is called by get_archetype() 562 * Creates an object. This function is called by get_archetype()
561 * if it fails to find the appropriate archetype. 563 * if it fails to find the appropriate archetype.
563 * an object, and never NULL. 565 * an object, and never NULL.
564 */ 566 */
565object * 567object *
566create_singularity (const char *name) 568create_singularity (const char *name)
567{ 569{
568 object *op; 570 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
571
572 if (!strcmp (name, "bug"))
573 abort ();
574
569 char buf[MAX_BUF]; 575 char buf[MAX_BUF];
576 sprintf (buf, "bug, please report (%s)", name);
570 577
571 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 578 object *op = get_archetype ("bug");
572 op = object::create ();
573 op->name = op->name_pl = buf; 579 op->name = op->name_pl = buf;
574 SET_FLAG (op, FLAG_NO_PICK); 580
575 return op; 581 return op;
576} 582}
577 583
578/* 584/*
579 * Finds which archetype matches the given name, and returns a new 585 * Finds which archetype matches the given name, and returns a new
588 return create_singularity (name); 594 return create_singularity (name);
589 595
590 return arch_to_object (at); 596 return arch_to_object (at);
591} 597}
592 598
593/* 599object *
594 * Hash-function used by the arch-hashtable.
595 */
596
597unsigned long
598hasharch (const char *str, int tablesize)
599{
600 unsigned long hash = 0;
601 unsigned int i = 0;
602 const char *p;
603
604 /* use the one-at-a-time hash function, which supposedly is
605 * better than the djb2-like one used by perl5.005, but
606 * certainly is better then the bug used here before.
607 * see http://burtleburtle.net/bob/hash/doobs.html
608 */
609 for (p = str; i < MAXSTRING && *p; p++, i++)
610 {
611 hash += *p;
612 hash += hash << 10;
613 hash ^= hash >> 6;
614 }
615
616 hash += hash << 3;
617 hash ^= hash >> 11;
618 hash += hash << 15;
619
620 return hash % tablesize;
621}
622
623/*
624 * Finds, using the hashtable, which archetype matches the given name.
625 * returns a pointer to the found archetype, otherwise NULL.
626 */
627archetype *
628archetype::find (const char *name) 600archetype::get (const char *name)
629{ 601{
630 if (!name) 602 return get_archetype (name);
631 return 0;
632
633 AUTODECL (i, ht.find (name));
634
635 if (i == ht.end ())
636 return 0;
637 else
638 return i->second;
639}
640
641/*
642 * Adds an archetype to the hashtable.
643 */
644void
645archetype::hash_add ()
646{
647 ht.insert (std::make_pair (name, this));
648}
649
650void
651archetype::hash_del ()
652{
653 ht.erase (name);
654} 603}
655 604
656/* 605/*
657 * Returns the first archetype using the given type. 606 * Returns the first archetype using the given type.
658 * Used in treasure-generation. 607 * Used in treasure-generation.
659 */ 608 */
660archetype * 609archetype *
661type_to_archetype (int type) 610type_to_archetype (int type)
662{ 611{
663 archetype *at; 612 for_all_archetypes (at)
664 613 if (at->type == type && at->head_ () != at)
665 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
666 if (at->clone.type == type)
667 return at; 614 return at;
668 615
669 return 0; 616 return 0;
670} 617}
671 618
672/* 619/*
673 * Returns a new object copied from the first archetype matching 620 * Returns a new object copied from the first archetype matching
674 * the given type. 621 * the given type.
675 * Used in treasure-generation. 622 * Used in treasure-generation.
676 */ 623 */
677
678object * 624object *
679clone_arch (int type) 625clone_arch (int type)
680{ 626{
681 archetype *at; 627 archetype *at;
682 628
684 { 630 {
685 LOG (llevError, "Can't clone archetype %d\n", type); 631 LOG (llevError, "Can't clone archetype %d\n", type);
686 return 0; 632 return 0;
687 } 633 }
688 634
689 object *op = at->clone.clone (); 635 object *op = at->clone ();
690 op->instantiate (); 636 op->instantiate ();
691 return op; 637 return op;
692} 638}
693 639
694/* 640/*
695 * member: make instance from class 641 * member: make instance from class
696 */ 642 */
697
698object * 643object *
699object_create_arch (archetype *at) 644object_create_arch (archetype *at)
700{ 645{
701 object *op, *prev = 0, *head = 0; 646 object *op, *prev = 0, *head = 0;
702 647
703 while (at) 648 while (at)
704 { 649 {
705 op = arch_to_object (at); 650 op = arch_to_object (at);
651
706 op->x = at->clone.x; 652 op->x = at->x;
707 op->y = at->clone.y; 653 op->y = at->y;
708 654
709 if (head) 655 if (head)
710 op->head = head, prev->more = op; 656 op->head = head, prev->more = op;
711 657
712 if (!head) 658 if (!head)
713 head = op; 659 head = op;
714 660
715 prev = op; 661 prev = op;
716 at = at->more; 662 at = (archetype *)at->more;
717 } 663 }
718 664
719 return (head); 665 return head;
720} 666}
721 667

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines