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.15 by root, Sun Sep 10 13:20:12 2006 UTC vs.
Revision 1.45 by root, Fri Apr 13 07:26:29 2007 UTC

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

Diff Legend

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