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.25 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.63 by root, Mon Jun 4 13:04:00 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <cassert> 25#include <cassert>
25 26
26#include <tr1/unordered_map>
27
28#include <global.h> 27#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 28#include <funcpoint.h>
31#include <loader.h> 29#include <loader.h>
32 30
33/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
34#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
35
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */
42 33
43/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 39 * MSW 2003-04-29
49 */ 40 */
50 41
51#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif 55archvec archetypes;
65 56
66/** 57/**
67 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 60 * It does not use the hashtable system, but browse the whole archlist each time.
75 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
76 */ 67 */
77archetype * 68archetype *
78find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
79{ 70{
80 archetype *at; 71 shstr_cmp name_cmp (name);
81 72
82 if (name == NULL) 73 for_all_archetypes (at)
83 return (archetype *) NULL; 74 if (at->archname == name_cmp)
84
85 for (at = first_archetype; at != NULL; at = at->next)
86 {
87 if (!strcmp (at->clone.name, name))
88 return at; 75 return at;
89 } 76
90 return NULL; 77 return 0;
91} 78}
92 79
93/** 80/**
94 * This function retrieves an archetype by type and name that appears during 81 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 82 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
97 */ 84 */
98archetype * 85archetype *
99find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
100{ 87{
101 archetype *at; 88 shstr_cmp name_cmp (name);
102 89
103 if (name == NULL) 90 for_all_archetypes (at)
104 return NULL; 91 if (at->archname == name_cmp && at->type == type)
105
106 for (at = first_archetype; at != NULL; at = at->next)
107 {
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at; 92 return at;
110 }
111 93
112 return NULL; 94 return 0;
113} 95}
114 96
115/* This is a lot like the above function. Instead, we are trying to match 97/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 98 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 99 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
119 */ 101 */
120object * 102object *
121get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
122{ 104{
123 archetype * 105 shstr_cmp skill_cmp (skill);
124 at;
125 106
126 if (skill == NULL) 107 for_all_archetypes (at)
127 return NULL; 108 if (at->skill == skill_cmp && (type == -1 || type == at->type))
128
129 for (at = first_archetype; at != NULL; at = at->next)
130 {
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 109 return arch_to_object (at);
133 } 110
134 return NULL; 111 return 0;
135} 112}
136 113
137/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 115 * that matches both the type and subtype. type and subtype
139 * can be -1 to say ignore, but in this case, the match it does 116 * can be -1 to say ignore, but in this case, the match it does
142 * (eg, skills) 119 * (eg, skills)
143 */ 120 */
144archetype * 121archetype *
145get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
146{ 123{
147 archetype * 124 for_all_archetypes (at)
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
153 return at; 126 return at;
154 } 127
155 return NULL; 128 return 0;
156} 129}
157 130
158/** 131/**
159 * GROS - this returns a new object given the name that appears during the game 132 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
168 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
169 */ 142 */
170object * 143object *
171get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
172{ 145{
173 archetype *at;
174 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
175 int i; 147 int i;
176 148
177 assign (tmpname, name); 149 assign (tmpname, name);
178 150
179 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
180 { 152 {
181 tmpname[i] = 0; 153 tmpname[i] = 0;
154
182 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 156 return arch_to_object (at);
186 } 157 }
187 158
188 return create_singularity (name); 159 return create_singularity (name);
189} 160}
209item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 183 int count, retval = 0;
213 184
214 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
215 186
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 188 {
218 while (cp[0] == ' ') 189 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
304 } 275 }
305 276
306 return 0; 277 return 0;
307} 278}
308 279
309/* 280archetype::archetype (const char *name)
310 * Initialises the internal linked list of archetypes (read from file). 281{
311 * Then the global "empty_archetype" pointer is initialised. 282 stub = true;
312 * Then the blocksview[] array is initialised. 283 arch = this;
313 */ 284 this->archname = this->name = this->name_pl = name;
285}
286
287archetype::~archetype ()
288{
289 unlink ();
290}
314 291
315void 292void
316init_archetypes (void) 293archetype::link ()
317{ /* called from add_player() and edit() */ 294{
318 if (first_archetype != NULL) /* Only do this once */ 295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this))
298 archetypes.insert (this);
299}
300
301void
302archetype::unlink ()
303{
304 ht.erase (archname);
305
306 if (archetypes.contains (this))
307 archetypes.erase (this);
308}
309
310/*
311 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL.
313 */
314archetype *
315archetype::find (const char *name)
316{
317 if (!name)
319 return; 318 return 0;
320 319
321 arch_init = 1; 320 auto (i, ht.find (name));
322 load_archetypes (); 321
323 arch_init = 0; 322 if (i == ht.end ())
323 return 0;
324 else
325 return i->second;
326}
327
328archetype *
329archetype::get (const char *name)
330{
331 if (!name)
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336
337 archetype *at = find (name);
338
339 if (loading_arch && at && !at->stub)
340 {
341 at->unlink ();
342 at = 0;
343 }
344
345 if (!at || (!at->stub && loading_arch))
346 {
347 at = new archetype (name);
348 at->link ();
349 }
350
351 return at;
352}
353
354archetype *
355archetype::read (object_thawer &f)
356{
357 assert (f.kw == KW_object);
358
359 loading_arch = true; // hack to tell parse_kv et al. to behave
360
361 std::vector<archetype *> parts;
362
363 coroapi::cede_to_tick_every (10);
364
365 for (;;)
366 {
367 // the archetype might have been referenced earlier
368 // so try to find an existing stub archetype first
369 archetype *at = find (f.get_str ());
370
371 if (!at || !at->stub)
372 at = new archetype (f.get_str ());
373
374 f.next ();
375
376#if 0
377 // implementing it here in the server does neither allow multiple inheritence
378 // nor does it cleanly "just override". it would allow use in map files, though,
379 // and other resource files dynamically laoded (as opposed to being preprocessed).
380 // not that any of this is relevant as of yet...
381 if (f.kw == KW_inherit)
382 {
383 if (archetype *at = find (f.get_str ()))
384 *op = at->clone;
385 else
386 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
387 &at->archname, f.get_str ());
388
389 f.next ();
390 }
391#endif
392
393 if (!at->parse_kv (f))
394 goto fail;
395
396 at->post_load_check ();
397
398 parts.push_back (at);
399
400 if (f.kw != KW_more)
401 break;
402
403 f.next ();
404
405 if (f.kw != KW_object)
406 {
407 f.parse_error ("more object");
408 goto fail;
409 }
410 }
411
412 loading_arch = false;
413
414 {
415 auto (at, parts.begin ());
416
417 archetype *new_head = parts.front ();
418 archetype *old_head = find (new_head->archname);
419
420 for (auto (at, parts.begin ()); at != parts.end (); ++at)
421 fprintf (stderr, "%d: %s\n", at - parts.begin(), &(*at)->archname);//D
422
423 // check that all archetypes belong to the same old object or are new
424 for (auto (at, parts.begin ()); at != parts.end (); ++at)
425 {
426 archetype *new_part = *at;
427 archetype *old_part = find (new_part->archname);
428
429 if (old_part && old_part->head_ () != old_head)
430 {
431 fprintf (stderr, "nhn %s\n", &new_head->archname);//D
432 fprintf (stderr, "old_head %p,%p new_head %p,%p ph %p\n", old_head, old_part, new_head, new_part, old_part->head_());
433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
434 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
435 goto fail;
436 }
437 }
438
439 fprintf (stderr, "oh %p %s\n", old_head, &new_head->archname);//D
440
441 // deactivate existing archetype
442 for (archetype *at = old_head; at; at = (archetype *)at->more)
443 at->unlink ();
444
445 // reassemble new chain
446 new_head->min_x = new_head->max_x = new_head->x;
447 new_head->min_y = new_head->max_y = new_head->y;
448
449 archetype *less = new_head;
450 archetype *head = 0;
451 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
452 {
453 archetype *at = *p;
454
455 if (at->x < new_head->min_x) new_head->min_x = at->x;
456 if (at->y < new_head->min_y) new_head->min_y = at->y;
457 if (at->x > new_head->max_x) new_head->max_x = at->x;
458 if (at->y > new_head->max_y) new_head->max_y = at->y;
459
460 at->head = head; head = new_head;
461 less->more = at; less = at;
462 }
463
464 // now activate it
465 for (auto (p, parts.begin ()); p != parts.end (); ++p)
466 {
467 archetype *at = *p;
468 at->stub = false;
469 at->link ();
470 }
471
472 return new_head;
473 }
474
475fail:
476 for (auto (p, parts.begin ()); p != parts.end (); ++p)
477 (*p)->destroy (true);
478
479 loading_arch = false;
480 return 0;
481}
482
483/*
484 * Initialize global archtype pointers:
485 */
486void
487init_archetype_pointers ()
488{
489 ring_arch = archetype::find ("ring");
490 amulet_arch = archetype::find ("amulet");
491 staff_arch = archetype::find ("staff");
492 crown_arch = archetype::find ("crown");
324 empty_archetype = archetype::find ("empty_archetype"); 493 empty_archetype = archetype::find ("empty_archetype");
325
326/* init_blocksview();*/
327}
328
329/*
330 * Stores debug-information about how efficient the hashtable
331 * used for archetypes has been in the static errmsg array.
332 */
333
334void
335arch_info (object *op)
336{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
338 new_draw_info (NDI_BLACK, 0, op, errmsg);
339}
340
341/*
342 * Initialise the hashtable used by the archetypes.
343 */
344
345void
346clear_archetable (void)
347{
348 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
349}
350
351/*
352 * An alternative way to init the hashtable which is slower, but _works_...
353 */
354
355void
356init_archetable (void)
357{
358 archetype *at;
359
360 LOG (llevDebug, " Setting up archetable...\n");
361
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363 add_arch (at);
364
365 LOG (llevDebug, "done\n");
366}
367
368void
369free_all_archs (void)
370{
371 archetype *at, *next;
372 int i = 0, f = 0;
373
374 for (at = first_archetype; at != NULL; at = next)
375 {
376 if (at->more)
377 next = at->more;
378 else
379 next = at->next;
380
381 delete
382 at;
383
384 i++;
385 }
386 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
387}
388
389archetype::archetype ()
390{
391 clear_object (&clone); /* to initial state other also */
392 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394}
395
396archetype::~archetype ()
397{
398}
399
400/*
401 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures.
403 */
404void
405first_arch_pass (object_thawer & fp)
406{
407 archetype *at, *head = NULL, *last_more = NULL;
408
409 at->clone.arch = first_archetype = at = new archetype;
410
411 while (int i = load_object (fp, &at->clone, 0))
412 {
413 at->clone.speed_left = (float) (-0.1);
414 /* copy the body_info to the body_used - this is only really
415 * need for monsters, but doesn't hurt to do it for everything.
416 * by doing so, when a monster is created, it has good starting
417 * values for the body_used info, so when items are created
418 * for it, they can be properly equipped.
419 */
420 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
421
422 switch (i)
423 {
424 case LL_NORMAL: /* A new archetype, just link it with the previous */
425 if (last_more != NULL)
426 last_more->next = at;
427 if (head != NULL)
428 head->next = at;
429 head = last_more = at;
430#if 0
431 if (!op->type)
432 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
433#endif
434 at->tail_x = 0;
435 at->tail_y = 0;
436 break;
437
438 case LL_MORE: /* Another part of the previous archetype, link it correctly */
439
440 at->head = head;
441 at->clone.head = &head->clone;
442 if (last_more != NULL)
443 {
444 last_more->more = at;
445 last_more->clone.more = &at->clone;
446 }
447 last_more = at;
448
449 /* If this multipart image is still composed of individual small
450 * images, don't set the tail_.. values. We can't use them anyways,
451 * and setting these to zero makes the map sending to the client much
452 * easier as just looking at the head, we know what to do.
453 */
454 if (at->clone.face != head->clone.face)
455 {
456 head->tail_x = 0;
457 head->tail_y = 0;
458 }
459 else
460 {
461 if (at->clone.x > head->tail_x)
462 head->tail_x = at->clone.x;
463 if (at->clone.y > head->tail_y)
464 head->tail_y = at->clone.y;
465 }
466 break;
467
468 }
469
470 at = new archetype;
471
472 at->clone.arch = at;
473 }
474
475 delete at;
476}
477
478/*
479 * Reads the archetype file once more, and links all pointers between
480 * archetypes.
481 */
482
483void
484second_arch_pass (object_thawer & thawer)
485{
486 char buf[MAX_BUF], *variable = buf, *argument, *cp;
487 archetype *at = NULL, *other;
488
489 while (fgets (buf, MAX_BUF, thawer) != NULL)
490 {
491 if (*buf == '#')
492 continue;
493 if ((argument = strchr (buf, ' ')) != NULL)
494 {
495 *argument = '\0', argument++;
496 cp = argument + strlen (argument) - 1;
497 while (isspace (*cp))
498 {
499 *cp = '\0';
500 cp--;
501 }
502 }
503 if (!strcmp ("Object", variable))
504 {
505 if ((at = archetype::find (argument)) == NULL)
506 LOG (llevError, "Warning: failed to find arch %s\n", argument);
507 }
508 else if (!strcmp ("other_arch", variable))
509 {
510 if (at != NULL && at->clone.other_arch == NULL)
511 {
512 if ((other = archetype::find (argument)) == NULL)
513 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
514 else if (at != NULL)
515 at->clone.other_arch = other;
516 }
517 }
518 else if (!strcmp ("randomitems", variable))
519 {
520 if (at != NULL)
521 {
522 treasurelist *tl = find_treasurelist (argument);
523
524 if (tl == NULL)
525 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
526 else
527 at->clone.randomitems = tl;
528 }
529 }
530 }
531}
532
533#ifdef DEBUG
534void
535check_generators (void)
536{
537 archetype *at;
538
539 for (at = first_archetype; at != NULL; at = at->next)
540 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
541 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
542}
543#endif
544
545/*
546 * First initialises the archtype hash-table (init_archetable()).
547 * Reads and parses the archetype file (with the first and second-pass
548 * functions).
549 * Then initialises treasures by calling load_treasures().
550 */
551
552void
553load_archetypes (void)
554{
555 char filename[MAX_BUF];
556
557#if TIME_ARCH_LOAD
558 struct timeval
559 tv1,
560 tv2;
561#endif
562
563 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
564 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
565
566 {
567 object_thawer
568 thawer (filename);
569
570 clear_archetable ();
571 LOG (llevDebug, " arch-pass 1...\n");
572 first_arch_pass (thawer);
573 LOG (llevDebug, " done\n");
574 }
575
576 init_archetable ();
577 warn_archetypes = 1;
578
579 {
580 object_thawer
581 thawer (filename);
582
583 LOG (llevDebug, " loading treasure...\n");
584 load_treasures ();
585 LOG (llevDebug, " done\n arch-pass 2...\n");
586 second_arch_pass (thawer);
587 LOG (llevDebug, " done\n");
588#ifdef DEBUG
589 check_generators ();
590#endif
591 }
592 LOG (llevDebug, " done\n");
593} 494}
594 495
595/* 496/*
596 * Creates and returns a new object which is a copy of the given archetype. 497 * Creates and returns a new object which is a copy of the given archetype.
597 * This function returns NULL on failure. 498 * This function returns NULL on failure.
598 */ 499 */
599
600object * 500object *
601arch_to_object (archetype *at) 501arch_to_object (archetype *at)
602{ 502{
603 object *op; 503 if (!at)
604
605 if (at == NULL)
606 { 504 {
607 if (warn_archetypes)
608 LOG (llevError, "Couldn't find archetype.\n"); 505 LOG (llevError, "Couldn't find archetype.\n");
609
610 return NULL; 506 return 0;
611 } 507 }
612 508
613 op = get_object (); 509 object *op = at->clone ();
614 copy_object (&at->clone, op);
615 op->arch = at; 510 op->arch = at;
616 op->instantiate (); 511 op->instantiate ();
512
617 return op; 513 return op;
618} 514}
619 515
620/* 516/*
621 * Creates an object. This function is called by get_archetype() 517 * Creates an object. This function is called by get_archetype()
622 * if it fails to find the appropriate archetype. 518 * if it fails to find the appropriate archetype.
623 * Thus get_archetype() will be guaranteed to always return 519 * Thus get_archetype() will be guaranteed to always return
624 * an object, and never NULL. 520 * an object, and never NULL.
625 */ 521 */
626
627object * 522object *
628create_singularity (const char *name) 523create_singularity (const char *name)
629{ 524{
630 object *op; 525 object *op;
631 char buf[MAX_BUF]; 526 char buf[MAX_BUF];
632 527
633 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 528 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
634 op = get_object (); 529 op = object::create ();
635 op->name = op->name_pl = buf; 530 op->name = op->name_pl = buf;
636 SET_FLAG (op, FLAG_NO_PICK); 531 SET_FLAG (op, FLAG_NO_PICK);
637 return op; 532 return op;
638} 533}
639 534
640/* 535/*
641 * Finds which archetype matches the given name, and returns a new 536 * Finds which archetype matches the given name, and returns a new
642 * object containing a copy of the archetype. 537 * object containing a copy of the archetype.
643 */ 538 */
644
645object * 539object *
646get_archetype (const char *name) 540get_archetype (const char *name)
647{ 541{
648 archetype *at = archetype::find (name); 542 archetype *at = archetype::find (name);
649 543
652 546
653 return arch_to_object (at); 547 return arch_to_object (at);
654} 548}
655 549
656/* 550/*
657 * Hash-function used by the arch-hashtable.
658 */
659
660unsigned long
661hasharch (const char *str, int tablesize)
662{
663 unsigned long hash = 0;
664 unsigned int i = 0;
665 const char *p;
666
667 /* use the one-at-a-time hash function, which supposedly is
668 * better than the djb2-like one used by perl5.005, but
669 * certainly is better then the bug used here before.
670 * see http://burtleburtle.net/bob/hash/doobs.html
671 */
672 for (p = str; i < MAXSTRING && *p; p++, i++)
673 {
674 hash += *p;
675 hash += hash << 10;
676 hash ^= hash >> 6;
677 }
678
679 hash += hash << 3;
680 hash ^= hash >> 11;
681 hash += hash << 15;
682
683 return hash % tablesize;
684}
685
686/*
687 * Finds, using the hashtable, which archetype matches the given name.
688 * returns a pointer to the found archetype, otherwise NULL.
689 */
690
691archetype *
692archetype::find (const char *name)
693{
694 if (!name)
695 return 0;
696
697#if USE_UNORDERED_MAP
698 AUTODECL (i, ht.find ((size_t) name));
699
700 if (i == ht.end ())
701 return 0;
702 else
703 return i->second;
704#endif
705
706 archetype *at;
707 unsigned long index;
708
709 index = hasharch (name, ARCHTABLE);
710 arch_search++;
711 for (;;)
712 {
713 at = arch_table[index];
714
715 if (at == NULL)
716 {
717 if (warn_archetypes)
718 LOG (llevError, "Couldn't find archetype %s\n", name);
719
720 return NULL;
721 }
722
723 arch_cmp++;
724
725 if (!strcmp ((const char *) at->name, name))
726 return at;
727
728 if (++index >= ARCHTABLE)
729 index = 0;
730 }
731}
732
733/*
734 * Adds an archetype to the hashtable.
735 */
736
737static void
738add_arch (archetype *at)
739{
740#if USE_UNORDERED_MAP
741 ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
742#endif
743
744 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
745
746 for (;;)
747 {
748 if (arch_table[index] == NULL)
749 {
750 arch_table[index] = at;
751 return;
752 }
753
754 if (++index == ARCHTABLE)
755 index = 0;
756
757 if (index == org_index)
758 fatal (ARCHTABLE_TOO_SMALL);
759 }
760}
761
762/*
763 * Returns the first archetype using the given type. 551 * Returns the first archetype using the given type.
764 * Used in treasure-generation. 552 * Used in treasure-generation.
765 */ 553 */
766
767archetype * 554archetype *
768type_to_archetype (int type) 555type_to_archetype (int type)
769{ 556{
770 archetype *at; 557 for_all_archetypes (at)
771 558 if (at->type == type && at->head_ () != at)
772 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
773 if (at->clone.type == type)
774 return at; 559 return at;
775 560
776 return 0; 561 return 0;
777} 562}
778 563
779/* 564/*
780 * Returns a new object copied from the first archetype matching 565 * Returns a new object copied from the first archetype matching
781 * the given type. 566 * the given type.
782 * Used in treasure-generation. 567 * Used in treasure-generation.
783 */ 568 */
784
785object * 569object *
786clone_arch (int type) 570clone_arch (int type)
787{ 571{
788 archetype *at; 572 archetype *at;
789 object *op = get_object ();
790 573
791 if ((at = type_to_archetype (type)) == NULL) 574 if ((at = type_to_archetype (type)) == NULL)
792 { 575 {
793 LOG (llevError, "Can't clone archetype %d\n", type); 576 LOG (llevError, "Can't clone archetype %d\n", type);
794 free_object (op);
795 return NULL; 577 return 0;
796 } 578 }
797 579
798 copy_object (&at->clone, op); 580 object *op = at->clone ();
799 op->instantiate (); 581 op->instantiate ();
800 return op; 582 return op;
801} 583}
802 584
803/* 585/*
804 * member: make instance from class 586 * member: make instance from class
805 */ 587 */
806
807object * 588object *
808object_create_arch (archetype *at) 589object_create_arch (archetype *at)
809{ 590{
810 object *op, *prev = 0, *head = 0; 591 object *op, *prev = 0, *head = 0;
811 592
812 while (at) 593 while (at)
813 { 594 {
814 op = arch_to_object (at); 595 op = arch_to_object (at);
596
815 op->x = at->clone.x; 597 op->x = at->x;
816 op->y = at->clone.y; 598 op->y = at->y;
817 599
818 if (head) 600 if (head)
819 op->head = head, prev->more = op; 601 op->head = head, prev->more = op;
820 602
821 if (!head) 603 if (!head)
822 head = op; 604 head = op;
823 605
824 prev = op; 606 prev = op;
825 at = at->more; 607 at = (archetype *)at->more;
826 } 608 }
827 609
828 return (head); 610 return head;
829} 611}
830 612

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines