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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines