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

Diff Legend

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