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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines