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.46 by root, Mon Apr 16 06:23:39 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
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */
42 33
43/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 39 * MSW 2003-04-29
49 */ 40 */
50 41
51#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif 55static std::vector<archetype *> archetypes;
65 56
66/** 57/**
67 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
76 */ 67 */
77archetype * 68archetype *
78find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
79{ 70{
80 archetype *at; 71 shstr_cmp name_cmp (name);
81 72
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 73 for (archetype *at = first_archetype; at; at = at->next)
86 { 74 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 75 return at;
89 } 76
90 return NULL; 77 return 0;
91} 78}
92 79
93/** 80/**
94 * This function retrieves an archetype by type and name that appears during 81 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 82 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
97 */ 84 */
98archetype * 85archetype *
99find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
100{ 87{
101 archetype *at; 88 shstr_cmp name_cmp (name);
102 89
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 90 for (archetype *at = first_archetype; at; at = at->next)
107 { 91 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; 92 return at;
110 }
111 93
112 return NULL; 94 return 0;
113} 95}
114 96
115/* This is a lot like the above function. Instead, we are trying to match 97/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 98 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 99 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
119 */ 101 */
120object * 102object *
121get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
122{ 104{
123 archetype * 105 shstr_cmp skill_cmp (skill);
124 at;
125 106
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 107 for (archetype *at = first_archetype; at; at = at->next)
130 { 108 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); 109 return arch_to_object (at);
133 } 110
134 return NULL; 111 return 0;
135} 112}
136 113
137/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 115 * that matches both the type and subtype. type and subtype
139 * can be -1 to say ignore, but in this case, the match it does 116 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 119 * (eg, skills)
143 */ 120 */
144archetype * 121archetype *
145get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
146{ 123{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 124 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 126 return at;
154 } 127
155 return NULL; 128 return 0;
156} 129}
157 130
158/** 131/**
159 * GROS - this returns a new object given the name that appears during the game 132 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
169 */ 142 */
170object * 143object *
171get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
172{ 145{
173 archetype *at;
174 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
175 int i; 147 int i;
176 148
177 assign (tmpname, name); 149 assign (tmpname, name);
178 150
179 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
180 { 152 {
181 tmpname[i] = 0; 153 tmpname[i] = 0;
154
182 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 156 return arch_to_object (at);
186 } 157 }
187 158
188 return create_singularity (name); 159 return create_singularity (name);
189} 160}
… …
209item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 183 int count, retval = 0;
213 184
214 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
215 186
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 188 {
218 while (cp[0] == ' ') 189 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
… …
269 retval = 15; 240 retval = 15;
270 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
271 retval = 14; 242 retval = 14;
272 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
273 retval = 14; 244 retval = 14;
274
275 /* Do substring checks, so things like 'Str+1' will match. 245 /* Do substring checks, so things like 'Str+1' will match.
276 * retval of these should perhaps be lower - they are lower 246 * retval of these should perhaps be lower - they are lower
277 * then the specific strcasecmp aboves, but still higher than 247 * then the specific strcasecmp aboves, but still higher than
278 * some other match criteria. 248 * some other match criteria.
279 */ 249 */
… …
281 retval = 12; 251 retval = 12;
282 else if (strstr (query_base_name (op, 0), cp)) 252 else if (strstr (query_base_name (op, 0), cp))
283 retval = 12; 253 retval = 12;
284 else if (strstr (query_short_name (op), cp)) 254 else if (strstr (query_short_name (op), cp))
285 retval = 12; 255 retval = 12;
286
287 /* Check against plural/non plural based on count. */ 256 /* Check against plural/non plural based on count. */
288 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 257 else if (count > 1 && !strcasecmp (cp, op->name_pl))
289 {
290 retval = 6; 258 retval = 6;
291 }
292 else if (count == 1 && !strcasecmp (op->name, cp)) 259 else if (count == 1 && !strcasecmp (op->name, cp))
293 {
294 retval = 6; 260 retval = 6;
295 }
296 /* base name matched - not bad */ 261 /* base name matched - not bad */
297 else if (strcasecmp (cp, op->name) == 0 && !count) 262 else if (strcasecmp (cp, op->name) == 0 && !count)
298 retval = 4; 263 retval = 4;
299 /* Check for partial custom name, but give a real low priority */ 264 /* Check for partial custom name, but give a real low priority */
300 else if (op->custom_name && strstr (op->custom_name, cp)) 265 else if (op->custom_name && strstr (op->custom_name, cp))
… …
302 267
303 if (retval) 268 if (retval)
304 { 269 {
305 if (pl->type == PLAYER) 270 if (pl->type == PLAYER)
306 pl->contr->count = count; 271 pl->contr->count = count;
272
307 return retval; 273 return retval;
308 } 274 }
309 } 275 }
276
310 return 0; 277 return 0;
311} 278}
312
313/*
314 * Initialises the internal linked list of archetypes (read from file).
315 * Then the global "empty_archetype" pointer is initialised.
316 * Then the blocksview[] array is initialised.
317 */
318 279
319void 280void
320init_archetypes (void) 281init_archetypes (void)
321{ /* called from add_player() and edit() */ 282{
322 if (first_archetype != NULL) /* Only do this once */
323 return;
324
325 arch_init = 1;
326 load_archetypes (); 283 load_archetypes ();
327 arch_init = 0; 284
328 empty_archetype = archetype::find ("empty_archetype"); 285 empty_archetype = archetype::find ("empty_archetype");
329
330/* init_blocksview();*/
331} 286}
332 287
333/* 288archetype::archetype ()
334 * Stores debug-information about how efficient the hashtable 289{
335 * used for archetypes has been in the static errmsg array. 290 clone.arch = this;
336 */
337 291
292 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
293 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
294}
295
296archetype::~archetype ()
297{
298 //TODO: nuke ->more's
299}
300
301static void
302unlink (archetype *at)
303{
304 if (at->head)
305 at = at->head;
306
307 // destroy this archetype's link, making singletons out of its parts
308 while (at)
309 {
310 archetype *more = at->more;
311 at->clone.destroy_inv ();
312 at->head = at->more = 0;
313 at = more;
314 }
315}
316
317// dire hack, need to rationalise
338void 318void
339arch_info (object *op) 319overwrite (archetype *at, object *op)
340{ 320{
341 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 321 at->clone = *op;
342 new_draw_info (NDI_BLACK, 0, op, errmsg); 322
323 at->clone.arch = at;
324 //TODO: inv et al.
343} 325}
344 326
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_...
357 */
358
359void
360init_archetable (void)
361{
362 archetype *at; 327archetype *
363 328archetype::read (object_thawer &f)
364 LOG (llevDebug, " Setting up archetable...\n");
365
366 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
367 add_arch (at);
368
369 LOG (llevDebug, "done\n");
370}
371
372/*
373 * Dumps an archetype to debug-level output.
374 */
375
376void
377dump_arch (archetype *at)
378{ 329{
379 dump_object (&at->clone); 330 assert (f.kw == KW_object);
380}
381 331
382/* 332 archetype *head = get (f.get_str ());
383 * Dumps _all_ archetypes to debug-level output. 333 unlink (head);
384 * If you run crossfire with debug, and enter DM-mode, you can trigger 334 object *op = object::create ();
385 * this with the O key.
386 */
387 335
388void 336 if (!op->parse_kv (f))
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 } 337 {
398} 338 op->destroy (true);
399 339 // leak head
400void 340 return 0;
401free_all_archs (void)
402{
403 archetype *at, *next;
404 int i = 0, f = 0;
405
406 for (at = first_archetype; at != NULL; at = next)
407 { 341 }
408 if (at->more)
409 next = at->more;
410 else
411 next = at->next;
412 342
413 delete 343 overwrite (head, op);
414 at; 344 op->destroy ();
415 345
416 i++; 346 for (archetype *prev = head; f.kw == KW_more; )
417 } 347 {
418 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 348 f.next ();
419} 349 assert (f.kw == KW_object);
420 350
421archetype::archetype () 351 archetype *more = get (f.get_str ());
422{ 352 unlink (more);
423 clear_object (&clone); /* to initial state other also */ 353 object *op = object::create ();
424 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
425 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
426}
427 354
428archetype::~archetype () 355 if (!op->parse_kv (f))
429{ 356 {
357 op->destroy (true);
358 // leak head more*
359 return 0;
360 }
361
362 overwrite (more, op);
363 op->destroy ();
364
365 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
366 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
367
368 more->head = head;
369 more->clone.head = &head->clone;
370 prev->more = more;
371 prev->clone.more = &more->clone;
372
373 prev = more;
374 }
375
376 if (!head->next)
377 {
378 head->next = first_archetype;
379 first_archetype = head;
380 }
381
382 return head;
430} 383}
431 384
432/* 385/*
433 * Reads/parses the archetype-file, and copies into a linked list 386 * Reads/parses the archetype-file, and copies into a linked list
434 * of archetype-structures. 387 * of archetype-structures.
435 */ 388 */
436void 389static bool
437first_arch_pass (object_thawer & fp) 390load_archetypes (object_thawer &f)
438{ 391{
439 archetype *at, *head = NULL, *last_more = NULL; 392 for (;;)
440
441 at->clone.arch = first_archetype = at = new archetype;
442
443 while (int i = load_object (fp, &at->clone, 0))
444 { 393 {
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) 394 switch (f.kw)
455 { 395 {
456 case LL_NORMAL: /* A new archetype, just link it with the previous */ 396 case KW_object:
457 if (last_more != NULL) 397 loading_arch = true;
458 last_more->next = at; 398 if (!archetype::read (f))
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 { 399 {
476 last_more->more = at; 400 loading_arch = false;
477 last_more->clone.more = &at->clone; 401 return false;
478 } 402 }
479 last_more = at;
480 403
481 /* If this multipart image is still composed of individual small 404 loading_arch = false;
482 * images, don't set the tail_.. values. We can't use them anyways, 405 continue;
483 * and setting these to zero makes the map sending to the client much 406
484 * easier as just looking at the head, we know what to do. 407 case KW_EOF:
485 */ 408 return true;
486 if (at->clone.face != head->clone.face) 409
487 { 410 default:
488 head->tail_x = 0; 411 if (!f.parse_error ("archetypes file"))
489 head->tail_y = 0;
490 }
491 else 412 return false;
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 } 413 }
501 414
502 at = new archetype; 415 f.next ();
503
504 at->clone.arch = at;
505 }
506
507 delete at;
508}
509
510/*
511 * Reads the archetype file once more, and links all pointers between
512 * archetypes.
513 */
514
515void
516second_arch_pass (object_thawer & thawer)
517{
518 char buf[MAX_BUF], *variable = buf, *argument, *cp;
519 archetype *at = NULL, *other;
520
521 while (fgets (buf, MAX_BUF, thawer) != NULL)
522 { 416 }
523 if (*buf == '#')
524 continue;
525 if ((argument = strchr (buf, ' ')) != NULL)
526 {
527 *argument = '\0', argument++;
528 cp = argument + strlen (argument) - 1;
529 while (isspace (*cp))
530 {
531 *cp = '\0';
532 cp--;
533 }
534 }
535 if (!strcmp ("Object", variable))
536 {
537 if ((at = archetype::find (argument)) == NULL)
538 LOG (llevError, "Warning: failed to find arch %s\n", argument);
539 }
540 else if (!strcmp ("other_arch", variable))
541 {
542 if (at != NULL && at->clone.other_arch == NULL)
543 {
544 if ((other = archetype::find (argument)) == NULL)
545 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
546 else if (at != NULL)
547 at->clone.other_arch = other;
548 }
549 }
550 else if (!strcmp ("randomitems", variable))
551 {
552 if (at != NULL)
553 {
554 treasurelist *
555 tl = find_treasurelist (argument);
556
557 if (tl == NULL)
558 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
559 else
560 at->clone.randomitems = tl;
561 }
562 }
563 }
564} 417}
565
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 418
578/* 419/*
579 * First initialises the archtype hash-table (init_archetable()). 420 * First initialises the archtype hash-table (init_archetable()).
580 * Reads and parses the archetype file (with the first and second-pass 421 * Reads and parses the archetype file (with the first and second-pass
581 * functions). 422 * functions).
582 * Then initialises treasures by calling load_treasures(). 423 * Then initialises treasures by calling load_treasures().
583 */ 424 */
584
585void 425void
586load_archetypes (void) 426load_archetypes (void)
587{ 427{
588 char filename[MAX_BUF]; 428 char filename[MAX_BUF];
589 429
590#if TIME_ARCH_LOAD
591 struct timeval
592 tv1,
593 tv2;
594#endif
595
596 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 430 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
597 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 431 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
598 432
599 {
600 object_thawer
601 thawer (filename); 433 object_thawer f (filename);
602 434
603 clear_archetable (); 435 f.next ();
604 LOG (llevDebug, " arch-pass 1...\n");
605 first_arch_pass (thawer);
606 LOG (llevDebug, " done\n");
607 }
608 436
609 init_archetable (); 437 if (!load_archetypes (f))
438 cleanup ("unable to load archetypes");
439
610 warn_archetypes = 1; 440 warn_archetypes = 1;
611
612 {
613 object_thawer
614 thawer (filename);
615
616 LOG (llevDebug, " loading treasure...\n");
617 load_treasures ();
618 LOG (llevDebug, " done\n arch-pass 2...\n");
619 second_arch_pass (thawer);
620 LOG (llevDebug, " done\n");
621#ifdef DEBUG
622 check_generators ();
623#endif
624 }
625 LOG (llevDebug, " done\n");
626} 441}
627 442
628/* 443/*
629 * Creates and returns a new object which is a copy of the given archetype. 444 * Creates and returns a new object which is a copy of the given archetype.
630 * This function returns NULL on failure. 445 * This function returns NULL on failure.
631 */ 446 */
632
633object * 447object *
634arch_to_object (archetype *at) 448arch_to_object (archetype *at)
635{ 449{
636 object *op; 450 if (!at)
637
638 if (at == NULL)
639 { 451 {
640 if (warn_archetypes) 452 if (warn_archetypes)
641 LOG (llevError, "Couldn't find archetype.\n"); 453 LOG (llevError, "Couldn't find archetype.\n");
642 454
643 return NULL; 455 return NULL;
644 } 456 }
645 457
646 op = get_object (); 458 object *op = at->clone.clone ();
647 copy_object (&at->clone, op);
648 op->arch = at; 459 op->arch = at;
649 op->instantiate (); 460 op->instantiate ();
650 return op; 461 return op;
651} 462}
652 463
… …
654 * Creates an object. This function is called by get_archetype() 465 * Creates an object. This function is called by get_archetype()
655 * if it fails to find the appropriate archetype. 466 * if it fails to find the appropriate archetype.
656 * Thus get_archetype() will be guaranteed to always return 467 * Thus get_archetype() will be guaranteed to always return
657 * an object, and never NULL. 468 * an object, and never NULL.
658 */ 469 */
659
660object * 470object *
661create_singularity (const char *name) 471create_singularity (const char *name)
662{ 472{
663 object *op; 473 object *op;
664 char buf[MAX_BUF]; 474 char buf[MAX_BUF];
665 475
666 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 476 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
667 op = get_object (); 477 op = object::create ();
668 op->name = op->name_pl = buf; 478 op->name = op->name_pl = buf;
669 SET_FLAG (op, FLAG_NO_PICK); 479 SET_FLAG (op, FLAG_NO_PICK);
670 return op; 480 return op;
671} 481}
672 482
673/* 483/*
674 * Finds which archetype matches the given name, and returns a new 484 * Finds which archetype matches the given name, and returns a new
675 * object containing a copy of the archetype. 485 * object containing a copy of the archetype.
676 */ 486 */
677
678object * 487object *
679get_archetype (const char *name) 488get_archetype (const char *name)
680{ 489{
681 archetype *at = archetype::find (name); 490 archetype *at = archetype::find (name);
682 491
… …
718 527
719/* 528/*
720 * Finds, using the hashtable, which archetype matches the given name. 529 * Finds, using the hashtable, which archetype matches the given name.
721 * returns a pointer to the found archetype, otherwise NULL. 530 * returns a pointer to the found archetype, otherwise NULL.
722 */ 531 */
723
724archetype * 532archetype *
725archetype::find (const char *name) 533archetype::find (const char *name)
726{ 534{
727 if (!name) 535 if (!name)
728 return 0; 536 return 0;
729 537
730#if USE_UNORDERED_MAP
731 AUTODECL (i, ht.find ((size_t) name)); 538 AUTODECL (i, ht.find (name));
732 539
733 if (i == ht.end ()) 540 if (i == ht.end ())
734 return 0; 541 return 0;
735 else 542 else
736 return i->second; 543 return i->second;
737#endif 544}
738 545
739 archetype *at; 546archetype *
740 unsigned long index; 547archetype::get (const char *name)
548{
549 archetype *at = find (name);
741 550
742 index = hasharch (name, ARCHTABLE); 551 if (!at)
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 } 552 {
553 archetypes.push_back (at = new archetype);
554 at->name = name;
555 at->hash_add ();
556 }
557
558 return at;
764} 559}
765 560
766/* 561/*
767 * Adds an archetype to the hashtable. 562 * Adds an archetype to the hashtable.
768 */ 563 */
769 564void
770static void 565archetype::hash_add ()
771add_arch (archetype *at)
772{ 566{
773#if USE_UNORDERED_MAP 567 ht.insert (std::make_pair (name, this));
774 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 568}
775#endif
776 569
777 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 570void
778 571archetype::hash_del ()
779 for (;;) 572{
780 { 573 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} 574}
794 575
795/* 576/*
796 * Returns the first archetype using the given type. 577 * Returns the first archetype using the given type.
797 * Used in treasure-generation. 578 * Used in treasure-generation.
798 */ 579 */
799
800archetype * 580archetype *
801type_to_archetype (int type) 581type_to_archetype (int type)
802{ 582{
803 archetype *at;
804
805 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 583 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
806 if (at->clone.type == type) 584 if (at->clone.type == type)
807 return at; 585 return at;
808 586
809 return 0; 587 return 0;
810} 588}
… …
812/* 590/*
813 * Returns a new object copied from the first archetype matching 591 * Returns a new object copied from the first archetype matching
814 * the given type. 592 * the given type.
815 * Used in treasure-generation. 593 * Used in treasure-generation.
816 */ 594 */
817
818object * 595object *
819clone_arch (int type) 596clone_arch (int type)
820{ 597{
821 archetype *at; 598 archetype *at;
822 object *op = get_object ();
823 599
824 if ((at = type_to_archetype (type)) == NULL) 600 if ((at = type_to_archetype (type)) == NULL)
825 { 601 {
826 LOG (llevError, "Can't clone archetype %d\n", type); 602 LOG (llevError, "Can't clone archetype %d\n", type);
827 free_object (op);
828 return NULL; 603 return 0;
829 } 604 }
830 605
831 copy_object (&at->clone, op); 606 object *op = at->clone.clone ();
832 op->instantiate (); 607 op->instantiate ();
833 return op; 608 return op;
834} 609}
835 610
836/* 611/*

Diff Legend

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