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.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.46 by root, Mon Apr 16 06:23:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines