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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines