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.22 by root, Thu Sep 14 22:35:53 2006 UTC vs.
Revision 1.45 by root, Fri Apr 13 07:26:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <cassert> 25#include <cassert>
25 26
26#include <tr1/unordered_map>
27
28#include <global.h> 27#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 28#include <funcpoint.h>
31#include <loader.h> 29#include <loader.h>
32 30
33/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
34#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
35 33
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
42 35
43/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 41 * MSW 2003-04-29
49 */ 42 */
50 43
51#if USE_UNORDERED_MAP
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif
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)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 72 for (archetype *at = first_archetype; at; at = at->next)
86 { 73 if (at->clone.name == name_cmp)
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)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 89 for (archetype *at = first_archetype; at; at = at->next)
107 { 90 if (at->clone.name == name_cmp && at->clone.type == type)
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 * 104 shstr_cmp skill_cmp (skill);
124 at;
125 105
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
130 { 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 108 return arch_to_object (at);
133 } 109
134 return NULL; 110 return 0;
135} 111}
136 112
137/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 114 * 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 115 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 118 * (eg, skills)
143 */ 119 */
144archetype * 120archetype *
145get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
146{ 122{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 125 return at;
154 } 126
155 return NULL; 127 return 0;
156} 128}
157 129
158/** 130/**
159 * 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
160 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
169 */ 141 */
170object * 142object *
171get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
172{ 144{
173 archetype *at;
174 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
175 int i; 146 int i;
176 147
177 assign (tmpname, name); 148 assign (tmpname, name);
178 149
179 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
180 { 151 {
181 tmpname[i] = 0; 152 tmpname[i] = 0;
153
182 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 155 return arch_to_object (at);
186 } 156 }
187 157
188 return create_singularity (name); 158 return create_singularity (name);
189} 159}
… …
209item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
210{ 180{
211 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 182 int count, retval = 0;
213 183
214 strcpy (local_name, name); /* strtok is destructive to name */ 184 assign (local_name, name); /* strtok is destructive to name */
215 185
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 186 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 187 {
218 while (cp[0] == ' ') 188 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 189 ++cp; /* get rid of spaces */
… …
269 retval = 15; 239 retval = 15;
270 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 240 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
271 retval = 14; 241 retval = 14;
272 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 242 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
273 retval = 14; 243 retval = 14;
274
275 /* Do substring checks, so things like 'Str+1' will match. 244 /* Do substring checks, so things like 'Str+1' will match.
276 * retval of these should perhaps be lower - they are lower 245 * retval of these should perhaps be lower - they are lower
277 * then the specific strcasecmp aboves, but still higher than 246 * then the specific strcasecmp aboves, but still higher than
278 * some other match criteria. 247 * some other match criteria.
279 */ 248 */
… …
281 retval = 12; 250 retval = 12;
282 else if (strstr (query_base_name (op, 0), cp)) 251 else if (strstr (query_base_name (op, 0), cp))
283 retval = 12; 252 retval = 12;
284 else if (strstr (query_short_name (op), cp)) 253 else if (strstr (query_short_name (op), cp))
285 retval = 12; 254 retval = 12;
286
287 /* Check against plural/non plural based on count. */ 255 /* Check against plural/non plural based on count. */
288 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 256 else if (count > 1 && !strcasecmp (cp, op->name_pl))
289 {
290 retval = 6; 257 retval = 6;
291 }
292 else if (count == 1 && !strcasecmp (op->name, cp)) 258 else if (count == 1 && !strcasecmp (op->name, cp))
293 {
294 retval = 6; 259 retval = 6;
295 }
296 /* base name matched - not bad */ 260 /* base name matched - not bad */
297 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
298 retval = 4; 262 retval = 4;
299 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
300 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name && strstr (op->custom_name, cp))
… …
302 266
303 if (retval) 267 if (retval)
304 { 268 {
305 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
306 pl->contr->count = count; 270 pl->contr->count = count;
271
307 return retval; 272 return retval;
308 } 273 }
309 } 274 }
275
310 return 0; 276 return 0;
311} 277}
312 278
313/* 279/*
314 * Initialises the internal linked list of archetypes (read from file). 280 * Initialises the internal linked list of archetypes (read from file).
… …
329 295
330/* init_blocksview();*/ 296/* init_blocksview();*/
331} 297}
332 298
333/* 299/*
334 * Stores debug-information about how efficient the hashtable
335 * used for archetypes has been in the static errmsg array.
336 */
337
338void
339arch_info (object *op)
340{
341 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
342 new_draw_info (NDI_BLACK, 0, op, errmsg);
343}
344
345/*
346 * Initialise the hashtable used by the archetypes.
347 */
348
349void
350clear_archetable (void)
351{
352 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
353}
354
355/*
356 * An alternative way to init the hashtable which is slower, but _works_... 300 * An alternative way to init the hashtable which is slower, but _works_...
357 */ 301 */
358
359void 302void
360init_archetable (void) 303init_archetable (void)
361{ 304{
362 archetype *at;
363
364 LOG (llevDebug, " Setting up archetable...\n"); 305 LOG (llevDebug, " Setting up archetable...\n");
365 306
366 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 307 for (archetype *at = first_archetype; at; at = at->next)
367 add_arch (at); 308 for (archetype *bt = at; bt; bt = bt->more)
309 bt->hash_add ();
368 310
369 LOG (llevDebug, "done\n"); 311 LOG (llevDebug, "done\n");
370}
371
372/*
373 * Dumps an archetype to debug-level output.
374 */
375
376void
377dump_arch (archetype *at)
378{
379 dump_object (&at->clone);
380}
381
382/*
383 * Dumps _all_ archetypes to debug-level output.
384 * If you run crossfire with debug, and enter DM-mode, you can trigger
385 * this with the O key.
386 */
387
388void
389dump_all_archetypes (void)
390{
391 archetype *at;
392
393 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
394 {
395 dump_arch (at);
396 fprintf (logfile, "%s\n", errmsg);
397 }
398} 312}
399 313
400void 314void
401free_all_archs (void) 315free_all_archs (void)
402{ 316{
403 archetype *at, *next; 317 archetype *at, *next;
404 int i = 0, f = 0; 318 int i = 0, f = 0;
405 319
406 for (at = first_archetype; at != NULL; at = next) 320 for (at = first_archetype; at; at = next)
407 { 321 {
408 if (at->more) 322 if (at->more)
409 next = at->more; 323 next = at->more;
410 else 324 else
411 next = at->next; 325 next = at->next;
… …
413 delete 327 delete
414 at; 328 at;
415 329
416 i++; 330 i++;
417 } 331 }
332
418 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
419} 334}
420 335
421archetype::archetype () 336archetype::archetype ()
422{ 337{
423 clear_object (&clone); /* to initial state other also */ 338 clone.arch = this;
339
424 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
425 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
426} 342}
427 343
428archetype::~archetype () 344archetype::~archetype ()
429{ 345{
346 //TODO: nuke ->more's
347}
348
349archetype *
350archetype::read (object_thawer &f)
351{
352 assert (f.kw == KW_object);
353
354 archetype *head = new archetype;
355 f.get (head->name);
356
357 if (!head->clone.parse_kv (f))
358 {
359 delete head;
360 return 0;
361 }
362
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next ();
366
367 assert (f.kw == KW_object);
368
369 archetype *more = new archetype;
370 f.get (more->name);
371
372 if (!more->clone.parse_kv (f))
373 {
374 delete head;
375 return 0;
376 }
377
378 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
379 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
380
381 more->head = head;
382 more->clone.head = &head->clone;
383 prev->more = more;
384 prev->clone.more = &more->clone;
385
386 prev = more;
387 }
388
389 head->next = first_archetype;
390 first_archetype = head;
391
392 return head;
430} 393}
431 394
432/* 395/*
433 * Reads/parses the archetype-file, and copies into a linked list 396 * Reads/parses the archetype-file, and copies into a linked list
434 * of archetype-structures. 397 * of archetype-structures.
435 */ 398 */
436void 399static bool
437first_arch_pass (object_thawer & fp) 400first_arch_pass (object_thawer &f)
438{ 401{
439 archetype *at, *head = NULL, *last_more = NULL; 402 for (;;)
440
441 at->clone.arch = first_archetype = at = new archetype;
442
443 while (int i = load_object (fp, &at->clone, 0))
444 { 403 {
445 at->clone.speed_left = (float) (-0.1);
446 /* copy the body_info to the body_used - this is only really
447 * need for monsters, but doesn't hurt to do it for everything.
448 * by doing so, when a monster is created, it has good starting
449 * values for the body_used info, so when items are created
450 * for it, they can be properly equipped.
451 */
452 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
453
454 switch (i) 404 switch (f.kw)
455 {
456 case LL_NORMAL: /* A new archetype, just link it with the previous */
457 if (last_more != NULL)
458 last_more->next = at;
459 if (head != NULL)
460 head->next = at;
461 head = last_more = at;
462#if 0
463 if (!op->type)
464 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
465#endif
466 at->tail_x = 0;
467 at->tail_y = 0;
468 break;
469
470 case LL_MORE: /* Another part of the previous archetype, link it correctly */
471
472 at->head = head;
473 at->clone.head = &head->clone;
474 if (last_more != NULL)
475 {
476 last_more->more = at;
477 last_more->clone.more = &at->clone;
478 }
479 last_more = at;
480
481 /* If this multipart image is still composed of individual small
482 * images, don't set the tail_.. values. We can't use them anyways,
483 * and setting these to zero makes the map sending to the client much
484 * easier as just looking at the head, we know what to do.
485 */
486 if (at->clone.face != head->clone.face)
487 {
488 head->tail_x = 0;
489 head->tail_y = 0;
490 }
491 else
492 {
493 if (at->clone.x > head->tail_x)
494 head->tail_x = at->clone.x;
495 if (at->clone.y > head->tail_y)
496 head->tail_y = at->clone.y;
497 }
498 break;
499
500 } 405 {
406 case KW_object:
407 if (!archetype::read (f))
408 return false;
409 continue;
501 410
502 at = new archetype; 411 case KW_EOF:
412 return true;
503 413
504 at->clone.arch = at; 414 default:
505 } 415 if (!f.parse_error ("archetypes file"))
416 return false;
417 }
506 418
507 delete at; 419 f.next ();
420 }
508} 421}
509 422
510/* 423/*
511 * Reads the archetype file once more, and links all pointers between 424 * Reads the archetype file once more, and links all pointers between
512 * archetypes. 425 * archetypes.
513 */ 426 */
514
515void 427void
516second_arch_pass (object_thawer & thawer) 428second_arch_pass (object_thawer & thawer)
517{ 429{
518 char buf[MAX_BUF], *variable = buf, *argument, *cp; 430 char buf[MAX_BUF], *variable = buf, *argument, *cp;
519 archetype *at = NULL, *other; 431 archetype *at = NULL, *other;
520 432
521 while (fgets (buf, MAX_BUF, thawer) != NULL) 433 while (fgets (buf, MAX_BUF, thawer) != NULL)
522 { 434 {
523 if (*buf == '#') 435 if (*buf == '#')
524 continue; 436 continue;
437
525 if ((argument = strchr (buf, ' ')) != NULL) 438 if ((argument = strchr (buf, ' ')) != NULL)
526 { 439 {
527 *argument = '\0', argument++; 440 *argument = '\0', argument++;
528 cp = argument + strlen (argument) - 1; 441 cp = argument + strlen (argument) - 1;
529 while (isspace (*cp)) 442 while (isspace (*cp))
530 { 443 {
531 *cp = '\0'; 444 *cp = '\0';
532 cp--; 445 cp--;
533 } 446 }
534 } 447 }
448
535 if (!strcmp ("Object", variable)) 449 if (!strcmp ("object", variable))
536 { 450 {
537 if ((at = archetype::find (argument)) == NULL) 451 if ((at = archetype::find (argument)) == NULL)
538 LOG (llevError, "Warning: failed to find arch %s\n", argument); 452 LOG (llevError, "Warning: failed to find arch %s\n", argument);
539 } 453 }
540 else if (!strcmp ("other_arch", variable)) 454 else if (!strcmp ("other_arch", variable))
… …
547 at->clone.other_arch = other; 461 at->clone.other_arch = other;
548 } 462 }
549 } 463 }
550 else if (!strcmp ("randomitems", variable)) 464 else if (!strcmp ("randomitems", variable))
551 { 465 {
552 if (at != NULL) 466 if (at)
553 { 467 {
554 treasurelist *
555 tl = find_treasurelist (argument); 468 treasurelist *tl = find_treasurelist (argument);
556 469
557 if (tl == NULL) 470 if (tl == NULL)
558 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 471 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
559 else 472 else
560 at->clone.randomitems = tl; 473 at->clone.randomitems = tl;
561 } 474 }
562 } 475 }
563 } 476 }
564} 477}
565 478
566#ifdef DEBUG
567void
568check_generators (void)
569{
570 archetype *at;
571
572 for (at = first_archetype; at != NULL; at = at->next)
573 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
574 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
575}
576#endif
577
578/* 479/*
579 * First initialises the archtype hash-table (init_archetable()). 480 * First initialises the archtype hash-table (init_archetable()).
580 * Reads and parses the archetype file (with the first and second-pass 481 * Reads and parses the archetype file (with the first and second-pass
581 * functions). 482 * functions).
582 * Then initialises treasures by calling load_treasures(). 483 * Then initialises treasures by calling load_treasures().
583 */ 484 */
584
585void 485void
586load_archetypes (void) 486load_archetypes (void)
587{ 487{
588 char filename[MAX_BUF]; 488 char filename[MAX_BUF];
589 489
590#if TIME_ARCH_LOAD
591 struct timeval
592 tv1,
593 tv2;
594#endif
595
596 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 490 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
597 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 491 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
598 492
599 { 493 {
600 object_thawer
601 thawer (filename); 494 object_thawer f (filename);
602 495
603 clear_archetable (); 496 f.next ();
497
604 LOG (llevDebug, " arch-pass 1...\n"); 498 LOG (llevDebug, " arch-pass 1...\n");
605 first_arch_pass (thawer); 499 if (!first_arch_pass (f))
500 cleanup ("errors during first arch pass are fatal");
606 LOG (llevDebug, " done\n"); 501 LOG (llevDebug, " done\n");
607 } 502 }
608 503
609 init_archetable (); 504 init_archetable ();
610 warn_archetypes = 1; 505 warn_archetypes = 1;
611 506
612 { 507 {
613 object_thawer
614 thawer (filename); 508 object_thawer f (filename);
615 509
616 LOG (llevDebug, " loading treasure...\n"); 510 LOG (llevDebug, " loading treasure...\n");
617 load_treasures (); 511 load_treasures ();
618 LOG (llevDebug, " done\n arch-pass 2...\n");
619 second_arch_pass (thawer);
620 LOG (llevDebug, " done\n"); 512 LOG (llevDebug, " done\n");
621#ifdef DEBUG 513 LOG (llevDebug, " arch-pass 2...\n");
622 check_generators (); 514 second_arch_pass (f);
623#endif 515 LOG (llevDebug, " done\n");
624 } 516 }
625 LOG (llevDebug, " done\n"); 517 LOG (llevDebug, " done\n");
626} 518}
627 519
628/* 520/*
629 * Creates and returns a new object which is a copy of the given archetype. 521 * Creates and returns a new object which is a copy of the given archetype.
630 * This function returns NULL on failure. 522 * This function returns NULL on failure.
631 */ 523 */
632
633object * 524object *
634arch_to_object (archetype *at) 525arch_to_object (archetype *at)
635{ 526{
636 object *op; 527 if (!at)
637
638 if (at == NULL)
639 { 528 {
640 if (warn_archetypes) 529 if (warn_archetypes)
641 LOG (llevError, "Couldn't find archetype.\n"); 530 LOG (llevError, "Couldn't find archetype.\n");
642 531
643 return NULL; 532 return NULL;
644 } 533 }
645 534
646 op = get_object (); 535 object *op = at->clone.clone ();
647 copy_object (&at->clone, op);
648 op->arch = at; 536 op->arch = at;
649 op->instantiate (); 537 op->instantiate ();
650 return op; 538 return op;
651} 539}
652 540
… …
654 * Creates an object. This function is called by get_archetype() 542 * Creates an object. This function is called by get_archetype()
655 * if it fails to find the appropriate archetype. 543 * if it fails to find the appropriate archetype.
656 * Thus get_archetype() will be guaranteed to always return 544 * Thus get_archetype() will be guaranteed to always return
657 * an object, and never NULL. 545 * an object, and never NULL.
658 */ 546 */
659
660object * 547object *
661create_singularity (const char *name) 548create_singularity (const char *name)
662{ 549{
663 object *op; 550 object *op;
664 char buf[MAX_BUF]; 551 char buf[MAX_BUF];
665 552
666 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 553 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
667 op = get_object (); 554 op = object::create ();
668 op->name = op->name_pl = buf; 555 op->name = op->name_pl = buf;
669 SET_FLAG (op, FLAG_NO_PICK); 556 SET_FLAG (op, FLAG_NO_PICK);
670 return op; 557 return op;
671} 558}
672 559
673/* 560/*
674 * Finds which archetype matches the given name, and returns a new 561 * Finds which archetype matches the given name, and returns a new
675 * object containing a copy of the archetype. 562 * object containing a copy of the archetype.
676 */ 563 */
677
678object * 564object *
679get_archetype (const char *name) 565get_archetype (const char *name)
680{ 566{
681 archetype *at = archetype::find (name); 567 archetype *at = archetype::find (name);
682 568
… …
718 604
719/* 605/*
720 * Finds, using the hashtable, which archetype matches the given name. 606 * Finds, using the hashtable, which archetype matches the given name.
721 * returns a pointer to the found archetype, otherwise NULL. 607 * returns a pointer to the found archetype, otherwise NULL.
722 */ 608 */
723
724archetype * 609archetype *
725archetype::find (const char *name) 610archetype::find (const char *name)
726{ 611{
727 if (!name) 612 if (!name)
728 return 0; 613 return 0;
729 614
730#if USE_UNORDERED_MAP
731 AUTODECL (i, ht.find ((size_t) name)); 615 AUTODECL (i, ht.find (name));
732 616
733 if (i == ht.end ()) 617 if (i == ht.end ())
734 return 0; 618 return 0;
735 else 619 else
736 return i->second; 620 return i->second;
737#endif
738
739 archetype *at;
740 unsigned long index;
741
742 index = hasharch (name, ARCHTABLE);
743 arch_search++;
744 for (;;)
745 {
746 at = arch_table[index];
747
748 if (at == NULL)
749 {
750 if (warn_archetypes)
751 LOG (llevError, "Couldn't find archetype %s\n", name);
752
753 return NULL;
754 }
755
756 arch_cmp++;
757
758 if (!strcmp ((const char *) at->name, name))
759 return at;
760
761 if (++index >= ARCHTABLE)
762 index = 0;
763 }
764} 621}
765 622
766/* 623/*
767 * Adds an archetype to the hashtable. 624 * Adds an archetype to the hashtable.
768 */ 625 */
769 626void
770static void 627archetype::hash_add ()
771add_arch (archetype *at)
772{ 628{
773#if USE_UNORDERED_MAP 629 ht.insert (std::make_pair (name, this));
774 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 630}
775#endif
776 631
777 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 632void
778 633archetype::hash_del ()
779 for (;;) 634{
780 { 635 ht.erase (name);
781 if (arch_table[index] == NULL)
782 {
783 arch_table[index] = at;
784 return;
785 }
786
787 if (++index == ARCHTABLE)
788 index = 0;
789
790 if (index == org_index)
791 fatal (ARCHTABLE_TOO_SMALL);
792 }
793} 636}
794 637
795/* 638/*
796 * Returns the first archetype using the given type. 639 * Returns the first archetype using the given type.
797 * Used in treasure-generation. 640 * Used in treasure-generation.
798 */ 641 */
799
800archetype * 642archetype *
801type_to_archetype (int type) 643type_to_archetype (int type)
802{ 644{
803 archetype *at; 645 archetype *at;
804 646
… …
817 659
818object * 660object *
819clone_arch (int type) 661clone_arch (int type)
820{ 662{
821 archetype *at; 663 archetype *at;
822 object *op = get_object ();
823 664
824 if ((at = type_to_archetype (type)) == NULL) 665 if ((at = type_to_archetype (type)) == NULL)
825 { 666 {
826 LOG (llevError, "Can't clone archetype %d\n", type); 667 LOG (llevError, "Can't clone archetype %d\n", type);
827 free_object (op);
828 return NULL; 668 return 0;
829 } 669 }
830 670
831 copy_object (&at->clone, op); 671 object *op = at->clone.clone ();
832 op->instantiate (); 672 op->instantiate ();
833 return op; 673 return op;
834} 674}
835 675
836/* 676/*

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines