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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines