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.20 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.52 by root, Tue Apr 17 10:06:32 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-devel@real-time.com 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}
206 * Last, make a check on the full name. 177 * Last, make a check on the full name.
207 */ 178 */
208int 179int
209item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *
212 cp,
213 local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
214 int 183 int count, retval = 0;
215 count,
216 retval = 0;
217 184
218 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
219 186
220 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
221 { 188 {
222 while (cp[0] == ' ') 189 while (cp[0] == ' ')
223 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
273 retval = 15; 240 retval = 15;
274 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
275 retval = 14; 242 retval = 14;
276 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
277 retval = 14; 244 retval = 14;
278
279 /* Do substring checks, so things like 'Str+1' will match. 245 /* Do substring checks, so things like 'Str+1' will match.
280 * retval of these should perhaps be lower - they are lower 246 * retval of these should perhaps be lower - they are lower
281 * then the specific strcasecmp aboves, but still higher than 247 * then the specific strcasecmp aboves, but still higher than
282 * some other match criteria. 248 * some other match criteria.
283 */ 249 */
285 retval = 12; 251 retval = 12;
286 else if (strstr (query_base_name (op, 0), cp)) 252 else if (strstr (query_base_name (op, 0), cp))
287 retval = 12; 253 retval = 12;
288 else if (strstr (query_short_name (op), cp)) 254 else if (strstr (query_short_name (op), cp))
289 retval = 12; 255 retval = 12;
290
291 /* Check against plural/non plural based on count. */ 256 /* Check against plural/non plural based on count. */
292 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 257 else if (count > 1 && !strcasecmp (cp, op->name_pl))
293 {
294 retval = 6; 258 retval = 6;
295 }
296 else if (count == 1 && !strcasecmp (op->name, cp)) 259 else if (count == 1 && !strcasecmp (op->name, cp))
297 {
298 retval = 6; 260 retval = 6;
299 }
300 /* base name matched - not bad */ 261 /* base name matched - not bad */
301 else if (strcasecmp (cp, op->name) == 0 && !count) 262 else if (strcasecmp (cp, op->name) == 0 && !count)
302 retval = 4; 263 retval = 4;
303 /* Check for partial custom name, but give a real low priority */ 264 /* Check for partial custom name, but give a real low priority */
304 else if (op->custom_name && strstr (op->custom_name, cp)) 265 else if (op->custom_name && strstr (op->custom_name, cp))
306 267
307 if (retval) 268 if (retval)
308 { 269 {
309 if (pl->type == PLAYER) 270 if (pl->type == PLAYER)
310 pl->contr->count = count; 271 pl->contr->count = count;
272
311 return retval; 273 return retval;
312 } 274 }
313 } 275 }
276
314 return 0; 277 return 0;
315} 278}
316 279
317/* 280archetype::archetype ()
318 * Initialises the internal linked list of archetypes (read from file). 281{
319 * Then the global "empty_archetype" pointer is initialised. 282 clone.arch = this;
320 * Then the blocksview[] array is initialised.
321 */
322 283
284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286}
287
288archetype::~archetype ()
289{
290 //TODO: nuke ->more's
291}
292
293static void
294unlink (archetype *at)
295{
296 if (at->head)
297 at = at->head;
298
299 // destroy this archetype's link, making singletons out of its parts
300 while (at)
301 {
302 archetype *more = at->more;
303 at->clone.destroy_inv ();
304 at->head = at->more = 0;
305 at = more;
306 }
307}
308
309// dire hack, need to rationalise
323void 310void
324init_archetypes (void) 311overwrite (archetype *at, object *op)
325{ /* called from add_player() and edit() */
326 if (first_archetype != NULL) /* Only do this once */
327 return;
328
329 arch_init = 1;
330 load_archetypes ();
331 arch_init = 0;
332 empty_archetype = archetype::find ("empty_archetype");
333
334/* init_blocksview();*/
335}
336
337/*
338 * Stores debug-information about how efficient the hashtable
339 * used for archetypes has been in the static errmsg array.
340 */
341
342void
343arch_info (object *op)
344{ 312{
345 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 313 at->clone = *op;
346 new_draw_info (NDI_BLACK, 0, op, errmsg); 314
347} 315 at->clone.arch = at;
316 at->clone.inv = op->inv; op->inv = 0;
348 317
349/* 318 op->destroy ();
350 * Initialise the hashtable used by the archetypes.
351 */
352
353void
354clear_archetable (void)
355{
356 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
357} 319}
358 320
359/* 321bool
360 * An alternative way to init the hashtable which is slower, but _works_... 322archetype::load (object_thawer &f)
361 */
362
363void
364init_archetable (void)
365{ 323{
366 archetype * 324 assert (f.kw == KW_object);
367 at;
368 325
369 LOG (llevDebug, " Setting up archetable...\n"); 326 typedef std::pair<archetype *, object *> part;
327 std::vector<part> parts;
370 328
371 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 329 coroapi::cede_to_tick_every (100);
372 add_arch (at);
373 330
374 LOG (llevDebug, "done\n"); 331 for (;;)
375} 332 {
333 archetype *at = get (f.get_str ());
334 object *op = object::create ();
376 335
377/* 336 if (!op->parse_kv (f))
378 * Dumps an archetype to debug-level output. 337 goto fail;
379 */
380 338
381void 339 parts.push_back (std::make_pair (at, op));
382dump_arch (archetype *at)
383{
384 dump_object (&at->clone);
385}
386 340
387/* 341 if (f.kw != KW_more)
388 * Dumps _all_ archetypes to debug-level output. 342 break;
389 * If you run crossfire with debug, and enter DM-mode, you can trigger
390 * this with the O key.
391 */
392 343
393void 344 f.next ();
394dump_all_archetypes (void) 345 assert (f.kw == KW_object);
395{ 346 }
396 archetype *
397 at;
398 347
399 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 348 {
349 archetype *head = parts.front ().first;
350
351 // check that all archetypes belong to the same object or are heads
352 for (auto (p, parts.begin ()); p != parts.end (); ++p)
400 { 353 {
401 dump_arch (at); 354 archetype *at = p->first;
402 fprintf (logfile, "%s\n", errmsg); 355
356 if (at->head != head && at->head)
357 {
358 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
359 goto fail;
360 }
361
362 if (at->next && at != head)
363 {
364 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
365 goto fail;
366 }
403 } 367 }
404}
405 368
406void 369 // sever chain of existing head object
407free_all_archs (void) 370 for (archetype *more, *at = head; at; at = more)
408{
409 archetype *
410 at, *
411 next;
412 int
413 i = 0, f = 0;
414
415 for (at = first_archetype; at != NULL; at = next)
416 { 371 {
417 if (at->more)
418 next = at->more; 372 more = at->more;
419 else
420 next = at->next;
421 373
422 delete 374 at->head = 0;
423 at; 375 at->more = 0;
424
425 i++;
426 } 376 }
427 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
428}
429 377
430archetype::archetype () 378 // replace/update head
431{ 379 overwrite (head, parts.front ().second);
432 clear_object (&clone); /* to initial state other also */ 380 head->tail_x = 0;
433 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 381 head->tail_y = 0;
434 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
435}
436 382
437archetype::~archetype () 383 // link into list of heads, if not already there
438{ 384 if (!head->linked)
385 {
386 head->linked = true;
387 head->next = first_archetype;
388 first_archetype = head;
389 }
390
391 // reassemble new chain
392 archetype *prev = head;
393 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
394 {
395 archetype *at = p->first;
396 overwrite (at, p->second);
397
398 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
399 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
400
401 at->head = head;
402 at->clone.head = &head->clone;
403 prev->more = at;
404 prev->clone.more = &at->clone;
405
406 prev = at;
407 }
408 }
409
410 return true;
411
412fail:
413 for (auto (p, parts.begin ()); p != parts.end (); ++p)
414 p->second->destroy (true);
415
416 return false;
439} 417}
440 418
441/* 419/*
442 * Reads/parses the archetype-file, and copies into a linked list 420 * Reads/parses the archetype-file, and copies into a linked list
443 * of archetype-structures. 421 * of archetype-structures.
444 */ 422 */
445void 423static bool
446first_arch_pass (object_thawer & fp) 424load_archetypes (object_thawer &f)
447{ 425{
448 archetype * 426 for (;;)
449 at, *
450 head = NULL, *last_more = NULL;
451
452 at->clone.arch = first_archetype = at = new archetype;
453
454 while (int i = load_object (fp, &at->clone, 0))
455 { 427 {
456 at->clone.speed_left = (float) (-0.1);
457 /* copy the body_info to the body_used - this is only really
458 * need for monsters, but doesn't hurt to do it for everything.
459 * by doing so, when a monster is created, it has good starting
460 * values for the body_used info, so when items are created
461 * for it, they can be properly equipped.
462 */
463 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
464
465 switch (i) 428 switch (f.kw)
466 { 429 {
467 case LL_NORMAL: /* A new archetype, just link it with the previous */ 430 case KW_object:
468 if (last_more != NULL) 431 loading_arch = true;
469 last_more->next = at; 432 if (!archetype::load (f))
470 if (head != NULL)
471 head->next = at;
472 head = last_more = at;
473#if 0
474 if (!op->type)
475 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
476#endif
477 at->tail_x = 0;
478 at->tail_y = 0;
479 break;
480
481 case LL_MORE: /* Another part of the previous archetype, link it correctly */
482
483 at->head = head;
484 at->clone.head = &head->clone;
485 if (last_more != NULL)
486 { 433 {
487 last_more->more = at; 434 loading_arch = false;
488 last_more->clone.more = &at->clone; 435 return false;
489 } 436 }
490 last_more = at;
491 437
492 /* If this multipart image is still composed of individual small 438 loading_arch = false;
493 * images, don't set the tail_.. values. We can't use them anyways, 439 continue;
494 * and setting these to zero makes the map sending to the client much 440
495 * easier as just looking at the head, we know what to do. 441 case KW_EOF:
496 */ 442 return true;
497 if (at->clone.face != head->clone.face) 443
498 { 444 default:
499 head->tail_x = 0; 445 if (!f.parse_error ("archetypes file"))
500 head->tail_y = 0;
501 }
502 else 446 return false;
503 {
504 if (at->clone.x > head->tail_x)
505 head->tail_x = at->clone.x;
506 if (at->clone.y > head->tail_y)
507 head->tail_y = at->clone.y;
508 }
509 break;
510
511 } 447 }
512 448
513 at = new archetype; 449 f.next ();
514
515 at->clone.arch = at;
516 }
517
518 delete at;
519}
520
521/*
522 * Reads the archetype file once more, and links all pointers between
523 * archetypes.
524 */
525
526void
527second_arch_pass (object_thawer & thawer)
528{
529 char
530 buf[MAX_BUF], *
531 variable = buf, *argument, *cp;
532 archetype *
533 at = NULL, *other;
534
535 while (fgets (buf, MAX_BUF, thawer) != NULL)
536 { 450 }
537 if (*buf == '#')
538 continue;
539 if ((argument = strchr (buf, ' ')) != NULL)
540 {
541 *argument = '\0', argument++;
542 cp = argument + strlen (argument) - 1;
543 while (isspace (*cp))
544 {
545 *cp = '\0';
546 cp--;
547 }
548 }
549 if (!strcmp ("Object", variable))
550 {
551 if ((at = archetype::find (argument)) == NULL)
552 LOG (llevError, "Warning: failed to find arch %s\n", argument);
553 }
554 else if (!strcmp ("other_arch", variable))
555 {
556 if (at != NULL && at->clone.other_arch == NULL)
557 {
558 if ((other = archetype::find (argument)) == NULL)
559 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
560 else if (at != NULL)
561 at->clone.other_arch = other;
562 }
563 }
564 else if (!strcmp ("randomitems", variable))
565 {
566 if (at != NULL)
567 {
568 treasurelist *
569 tl = find_treasurelist (argument);
570
571 if (tl == NULL)
572 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
573 else
574 at->clone.randomitems = tl;
575 }
576 }
577 }
578} 451}
579
580#ifdef DEBUG
581void
582check_generators (void)
583{
584 archetype *
585 at;
586
587 for (at = first_archetype; at != NULL; at = at->next)
588 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
589 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
590}
591#endif
592 452
593/* 453/*
594 * First initialises the archtype hash-table (init_archetable()). 454 * First initialises the archtype hash-table (init_archetable()).
595 * Reads and parses the archetype file (with the first and second-pass 455 * Reads and parses the archetype file (with the first and second-pass
596 * functions). 456 * functions).
597 * Then initialises treasures by calling load_treasures().
598 */ 457 */
599 458bool
600void 459load_archetype_file (const char *filename)
601load_archetypes (void)
602{ 460{
603 char
604 filename[MAX_BUF];
605
606#if TIME_ARCH_LOAD
607 struct timeval
608 tv1,
609 tv2;
610#endif
611
612 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
613 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
614
615 {
616 object_thawer
617 thawer (filename); 461 object_thawer f (filename);
618 462
619 clear_archetable (); 463 f.next ();
620 LOG (llevDebug, " arch-pass 1...\n");
621 first_arch_pass (thawer);
622 LOG (llevDebug, " done\n");
623 }
624 464
625 init_archetable (); 465 if (!load_archetypes (f))
466 return false;
467
626 warn_archetypes = 1; 468 warn_archetypes = 1;
627 469
628 { 470 empty_archetype = archetype::find ("empty_archetype");
629 object_thawer 471 if (!empty_archetype)
630 thawer (filename); 472 return false;
631 473
632 LOG (llevDebug, " loading treasure...\n"); 474 return true;
633 load_treasures ();
634 LOG (llevDebug, " done\n arch-pass 2...\n");
635 second_arch_pass (thawer);
636 LOG (llevDebug, " done\n");
637#ifdef DEBUG
638 check_generators ();
639#endif
640 }
641 LOG (llevDebug, " done\n");
642} 475}
643 476
644/* 477/*
645 * Creates and returns a new object which is a copy of the given archetype. 478 * Creates and returns a new object which is a copy of the given archetype.
646 * This function returns NULL on failure. 479 * This function returns NULL on failure.
647 */ 480 */
648
649object * 481object *
650arch_to_object (archetype *at) 482arch_to_object (archetype *at)
651{ 483{
652 object * 484 if (!at)
653 op;
654
655 if (at == NULL)
656 { 485 {
657 if (warn_archetypes) 486 if (warn_archetypes)
658 LOG (llevError, "Couldn't find archetype.\n"); 487 LOG (llevError, "Couldn't find archetype.\n");
659 488
660 return NULL; 489 return NULL;
661 } 490 }
662 491
663 op = get_object (); 492 object *op = at->clone.clone ();
664 copy_object (&at->clone, op);
665 op->arch = at; 493 op->arch = at;
666 op->instantiate (); 494 op->instantiate ();
667 return op; 495 return op;
668} 496}
669 497
671 * Creates an object. This function is called by get_archetype() 499 * Creates an object. This function is called by get_archetype()
672 * if it fails to find the appropriate archetype. 500 * if it fails to find the appropriate archetype.
673 * Thus get_archetype() will be guaranteed to always return 501 * Thus get_archetype() will be guaranteed to always return
674 * an object, and never NULL. 502 * an object, and never NULL.
675 */ 503 */
676
677object * 504object *
678create_singularity (const char *name) 505create_singularity (const char *name)
679{ 506{
680 object * op; 507 object *op;
681 char buf[MAX_BUF]; 508 char buf[MAX_BUF];
682 509
683 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 510 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
684 op = get_object (); 511 op = object::create ();
685 op->name = op->name_pl = buf; 512 op->name = op->name_pl = buf;
686 SET_FLAG (op, FLAG_NO_PICK); 513 SET_FLAG (op, FLAG_NO_PICK);
687 return op; 514 return op;
688} 515}
689 516
690/* 517/*
691 * Finds which archetype matches the given name, and returns a new 518 * Finds which archetype matches the given name, and returns a new
692 * object containing a copy of the archetype. 519 * object containing a copy of the archetype.
693 */ 520 */
694
695object * 521object *
696get_archetype (const char *name) 522get_archetype (const char *name)
697{ 523{
698 archetype *at = archetype::find (name); 524 archetype *at = archetype::find (name);
699 525
702 528
703 return arch_to_object (at); 529 return arch_to_object (at);
704} 530}
705 531
706/* 532/*
707 * Hash-function used by the arch-hashtable.
708 */
709
710unsigned long
711hasharch (const char *str, int tablesize)
712{
713 unsigned long hash = 0;
714 unsigned int i = 0;
715 const char *p;
716
717 /* use the one-at-a-time hash function, which supposedly is
718 * better than the djb2-like one used by perl5.005, but
719 * certainly is better then the bug used here before.
720 * see http://burtleburtle.net/bob/hash/doobs.html
721 */
722 for (p = str; i < MAXSTRING && *p; p++, i++)
723 {
724 hash += *p;
725 hash += hash << 10;
726 hash ^= hash >> 6;
727 }
728
729 hash += hash << 3;
730 hash ^= hash >> 11;
731 hash += hash << 15;
732
733 return hash % tablesize;
734}
735
736/*
737 * Finds, using the hashtable, which archetype matches the given name. 533 * Finds, using the hashtable, which archetype matches the given name.
738 * returns a pointer to the found archetype, otherwise NULL. 534 * returns a pointer to the found archetype, otherwise NULL.
739 */ 535 */
740
741archetype * 536archetype *
742archetype::find (const char *name) 537archetype::find (const char *name)
743{ 538{
744 if (!name) 539 if (!name)
745 return 0; 540 return 0;
746 541
747#if USE_UNORDERED_MAP 542 auto (i, ht.find (name));
748 AUTODECL (i, ht.find ((size_t) name));
749 543
750 if (i == ht.end ()) 544 if (i == ht.end ())
751 return 0; 545 return 0;
752 else 546 else
753 return i->second; 547 return i->second;
754#endif 548}
755 549
756 archetype *at; 550archetype *
757 unsigned long index; 551archetype::get (const char *name)
552{
553 archetype *at = find (name);
758 554
759 index = hasharch (name, ARCHTABLE); 555 if (!at)
760 arch_search++;
761 for (;;)
762 {
763 at = arch_table[index];
764
765 if (at == NULL)
766 {
767 if (warn_archetypes)
768 LOG (llevError, "Couldn't find archetype %s\n", name);
769
770 return NULL;
771 }
772
773 arch_cmp++;
774
775 if (!strcmp ((const char *) at->name, name))
776 return at;
777
778 if (++index >= ARCHTABLE)
779 index = 0;
780 } 556 {
557 archetypes.push_back (at = new archetype);
558 at->name = name;
559 at->hash_add ();
560 }
561
562 return at;
781} 563}
782 564
783/* 565/*
784 * Adds an archetype to the hashtable. 566 * Adds an archetype to the hashtable.
785 */ 567 */
786 568void
787static void 569archetype::hash_add ()
788add_arch (archetype *at)
789{ 570{
790#if USE_UNORDERED_MAP 571 ht.insert (std::make_pair (name, this));
791 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 572}
792#endif
793 573
794 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 574void
795 575archetype::hash_del ()
796 for (;;) 576{
797 { 577 ht.erase (name);
798 if (arch_table[index] == NULL)
799 {
800 arch_table[index] = at;
801 return;
802 }
803
804 if (++index == ARCHTABLE)
805 index = 0;
806
807 if (index == org_index)
808 fatal (ARCHTABLE_TOO_SMALL);
809 }
810} 578}
811 579
812/* 580/*
813 * Returns the first archetype using the given type. 581 * Returns the first archetype using the given type.
814 * Used in treasure-generation. 582 * Used in treasure-generation.
815 */ 583 */
816
817archetype * 584archetype *
818type_to_archetype (int type) 585type_to_archetype (int type)
819{ 586{
820 archetype *at;
821
822 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 587 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
823 if (at->clone.type == type) 588 if (at->clone.type == type)
824 return at; 589 return at;
825 590
826 return 0; 591 return 0;
827} 592}
829/* 594/*
830 * Returns a new object copied from the first archetype matching 595 * Returns a new object copied from the first archetype matching
831 * the given type. 596 * the given type.
832 * Used in treasure-generation. 597 * Used in treasure-generation.
833 */ 598 */
834
835object * 599object *
836clone_arch (int type) 600clone_arch (int type)
837{ 601{
838 archetype *at; 602 archetype *at;
839 object *op = get_object ();
840 603
841 if ((at = type_to_archetype (type)) == NULL) 604 if ((at = type_to_archetype (type)) == NULL)
842 { 605 {
843 LOG (llevError, "Can't clone archetype %d\n", type); 606 LOG (llevError, "Can't clone archetype %d\n", type);
844 free_object (op);
845 return NULL; 607 return 0;
846 } 608 }
847 609
848 copy_object (&at->clone, op); 610 object *op = at->clone.clone ();
849 op->instantiate (); 611 op->instantiate ();
850 return op; 612 return op;
851} 613}
852 614
853/* 615/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines