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.42 by root, Fri Feb 9 01:52:10 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 * 305 archetype *at;
373 at;
374 306
375 LOG (llevDebug, " Setting up archetable...\n"); 307 LOG (llevDebug, " Setting up archetable...\n");
376 308
377 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 309 for (at = first_archetype; at; at = at->more ? at->more : at->next)
378 add_arch (at); 310 at->hash_add ();
379 311
380 LOG (llevDebug, "done\n"); 312 LOG (llevDebug, "done\n");
381} 313}
382 314
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}
411
412void 315void
413free_all_archs (void) 316free_all_archs (void)
414{ 317{
415 archetype * 318 archetype *at, *next;
416 at, *
417 next;
418 int
419 i = 0, f = 0; 319 int i = 0, f = 0;
420 320
421 for (at = first_archetype; at != NULL; at = next) 321 for (at = first_archetype; at; at = next)
422 { 322 {
423 if (at->more) 323 if (at->more)
424 next = at->more; 324 next = at->more;
425 else 325 else
426 next = at->next; 326 next = at->next;
427 327
428 delete at; 328 delete
329 at;
330
429 i++; 331 i++;
430 } 332 }
333
431 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 334 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
432} 335}
433 336
434archetype::archetype () 337archetype::archetype ()
435{ 338{
436 clear_object (&clone); /* to initial state other also */
437 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 339 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
438 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 340 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
439} 341}
440 342
441archetype::~archetype () 343archetype::~archetype ()
442{ 344{
… …
447 * of archetype-structures. 349 * of archetype-structures.
448 */ 350 */
449void 351void
450first_arch_pass (object_thawer & fp) 352first_arch_pass (object_thawer & fp)
451{ 353{
452 archetype * 354 archetype *head = 0, *last_more = 0;
453 at, *
454 head = NULL, *last_more = NULL;
455 355
356 archetype *at = new archetype;
456 at->clone.arch = first_archetype = at = new archetype; 357 at->clone.arch = first_archetype = at;
457 358
458 while (int i = load_object (fp, &at->clone, 0)) 359 while (int i = load_object (fp, &at->clone, 0))
459 { 360 {
460 at->clone.speed_left = (float) (-0.1); 361 at->clone.speed_left = (float) (-0.1);
461 /* copy the body_info to the body_used - this is only really 362 /* copy the body_info to the body_used - this is only really
… …
517 at = new archetype; 418 at = new archetype;
518 419
519 at->clone.arch = at; 420 at->clone.arch = at;
520 } 421 }
521 422
522 delete 423 delete at;
523 at;
524} 424}
525 425
526/* 426/*
527 * Reads the archetype file once more, and links all pointers between 427 * Reads the archetype file once more, and links all pointers between
528 * archetypes. 428 * archetypes.
529 */ 429 */
530 430
531void 431void
532second_arch_pass (object_thawer & thawer) 432second_arch_pass (object_thawer & thawer)
533{ 433{
534 char
535 buf[MAX_BUF], *
536 variable = buf, *argument, *cp; 434 char buf[MAX_BUF], *variable = buf, *argument, *cp;
537 archetype *
538 at = NULL, *other; 435 archetype *at = NULL, *other;
539 436
540 while (fgets (buf, MAX_BUF, thawer) != NULL) 437 while (fgets (buf, MAX_BUF, thawer) != NULL)
541 { 438 {
542 if (*buf == '#') 439 if (*buf == '#')
543 continue; 440 continue;
441
544 if ((argument = strchr (buf, ' ')) != NULL) 442 if ((argument = strchr (buf, ' ')) != NULL)
545 { 443 {
546 *argument = '\0', argument++; 444 *argument = '\0', argument++;
547 cp = argument + strlen (argument) - 1; 445 cp = argument + strlen (argument) - 1;
548 while (isspace (*cp)) 446 while (isspace (*cp))
549 { 447 {
550 *cp = '\0'; 448 *cp = '\0';
551 cp--; 449 cp--;
552 } 450 }
553 } 451 }
452
554 if (!strcmp ("Object", variable)) 453 if (!strcmp ("object", variable))
555 { 454 {
556 if ((at = find_archetype (argument)) == NULL) 455 if ((at = archetype::find (argument)) == NULL)
557 LOG (llevError, "Warning: failed to find arch %s\n", argument); 456 LOG (llevError, "Warning: failed to find arch %s\n", argument);
558 } 457 }
559 else if (!strcmp ("other_arch", variable)) 458 else if (!strcmp ("other_arch", variable))
560 { 459 {
561 if (at != NULL && at->clone.other_arch == NULL) 460 if (at != NULL && at->clone.other_arch == NULL)
562 { 461 {
563 if ((other = find_archetype (argument)) == NULL) 462 if ((other = archetype::find (argument)) == NULL)
564 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 463 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
565 else if (at != NULL) 464 else if (at != NULL)
566 at->clone.other_arch = other; 465 at->clone.other_arch = other;
567 } 466 }
568 } 467 }
569 else if (!strcmp ("randomitems", variable)) 468 else if (!strcmp ("randomitems", variable))
570 { 469 {
571 if (at != NULL) 470 if (at)
572 { 471 {
573 treasurelist *
574 tl = find_treasurelist (argument); 472 treasurelist *tl = find_treasurelist (argument);
575 473
576 if (tl == NULL) 474 if (tl == NULL)
577 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 475 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
578 else 476 else
579 at->clone.randomitems = tl; 477 at->clone.randomitems = tl;
… …
584 482
585#ifdef DEBUG 483#ifdef DEBUG
586void 484void
587check_generators (void) 485check_generators (void)
588{ 486{
589 archetype * 487 archetype *at;
590 at;
591 488
592 for (at = first_archetype; at != NULL; at = at->next) 489 for (at = first_archetype; at != NULL; at = at->next)
593 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 490 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); 491 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
595} 492}
… …
603 */ 500 */
604 501
605void 502void
606load_archetypes (void) 503load_archetypes (void)
607{ 504{
608 char
609 filename[MAX_BUF]; 505 char filename[MAX_BUF];
610
611#if TIME_ARCH_LOAD
612 struct timeval
613 tv1,
614 tv2;
615#endif
616 506
617 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 507 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
618 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 508 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
619 509
620 { 510 {
511 object_thawer
621 object_thawer thawer (filename); 512 thawer (filename);
622 513
623 clear_archetable ();
624 LOG (llevDebug, " arch-pass 1...\n"); 514 LOG (llevDebug, " arch-pass 1...\n");
625 first_arch_pass (thawer); 515 first_arch_pass (thawer);
626 LOG (llevDebug, " done\n"); 516 LOG (llevDebug, " done\n");
627 } 517 }
628 518
629 init_archetable (); 519 init_archetable ();
630 warn_archetypes = 1; 520 warn_archetypes = 1;
631 521
632 { 522 {
523 object_thawer
633 object_thawer thawer (filename); 524 thawer (filename);
634 525
635 LOG (llevDebug, " loading treasure...\n"); 526 LOG (llevDebug, " loading treasure...\n");
636 load_treasures (); 527 load_treasures ();
528 LOG (llevDebug, " done\n");
637 LOG (llevDebug, " done\n arch-pass 2...\n"); 529 LOG (llevDebug, " arch-pass 2...\n");
638 second_arch_pass (thawer); 530 second_arch_pass (thawer);
639 LOG (llevDebug, " done\n"); 531 LOG (llevDebug, " done\n");
640#ifdef DEBUG 532#ifdef DEBUG
641 check_generators (); 533 check_generators ();
642#endif 534#endif
… …
646 538
647/* 539/*
648 * Creates and returns a new object which is a copy of the given archetype. 540 * Creates and returns a new object which is a copy of the given archetype.
649 * This function returns NULL on failure. 541 * This function returns NULL on failure.
650 */ 542 */
651
652object * 543object *
653arch_to_object (archetype *at) 544arch_to_object (archetype *at)
654{ 545{
655 object * 546 object *op;
656 op;
657 547
658 if (at == NULL) 548 if (at == NULL)
659 { 549 {
660 if (warn_archetypes) 550 if (warn_archetypes)
661 LOG (llevError, "Couldn't find archetype.\n"); 551 LOG (llevError, "Couldn't find archetype.\n");
662 552
663 return NULL; 553 return NULL;
664 } 554 }
665 555
666 op = get_object (); 556 op = at->clone.clone ();
667 copy_object (&at->clone, op);
668 op->arch = at; 557 op->arch = at;
669 op->instantiate (); 558 op->instantiate ();
670 return op; 559 return op;
671} 560}
672 561
… …
674 * Creates an object. This function is called by get_archetype() 563 * Creates an object. This function is called by get_archetype()
675 * if it fails to find the appropriate archetype. 564 * if it fails to find the appropriate archetype.
676 * Thus get_archetype() will be guaranteed to always return 565 * Thus get_archetype() will be guaranteed to always return
677 * an object, and never NULL. 566 * an object, and never NULL.
678 */ 567 */
679
680object * 568object *
681create_singularity (const char *name) 569create_singularity (const char *name)
682{ 570{
683 object * 571 object *op;
684 op;
685 char
686 buf[MAX_BUF]; 572 char buf[MAX_BUF];
687 573
688 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 574 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
689 op = get_object (); 575 op = object::create ();
690 op->name = op->name_pl = buf; 576 op->name = op->name_pl = buf;
691 SET_FLAG (op, FLAG_NO_PICK); 577 SET_FLAG (op, FLAG_NO_PICK);
692 return op; 578 return op;
693} 579}
694 580
695/* 581/*
696 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
697 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
698 */ 584 */
699
700object * 585object *
701get_archetype (const char *name) 586get_archetype (const char *name)
702{ 587{
703 archetype * 588 archetype *at = archetype::find (name);
704 at;
705 589
706 at = find_archetype (name); 590 if (!at)
707 if (at == NULL)
708 return create_singularity (name); 591 return create_singularity (name);
709 592
710 return arch_to_object (at); 593 return arch_to_object (at);
711} 594}
712 595
… …
715 */ 598 */
716 599
717unsigned long 600unsigned long
718hasharch (const char *str, int tablesize) 601hasharch (const char *str, int tablesize)
719{ 602{
720 unsigned long 603 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 604 unsigned int i = 0;
723 i = 0;
724 const char * 605 const char *p;
725 p;
726 606
727 /* use the one-at-a-time hash function, which supposedly is 607 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 608 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 609 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 610 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 625
746/* 626/*
747 * Finds, using the hashtable, which archetype matches the given name. 627 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 628 * returns a pointer to the found archetype, otherwise NULL.
749 */ 629 */
750
751archetype * 630archetype *
752find_archetype (const char *name) 631archetype::find (const char *name)
753{ 632{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 633 if (!name)
758 return 0; 634 return 0;
759 635
760 HT::const_iterator i = ht.find ((size_t) name); 636 AUTODECL (i, ht.find (name));
761 637
762 if (i == ht.end ()) 638 if (i == ht.end ())
763 return 0; 639 return 0;
764 else 640 else
765 return i->second; 641 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} 642}
794 643
795/* 644/*
796 * Adds an archetype to the hashtable. 645 * Adds an archetype to the hashtable.
797 */ 646 */
798 647void
799static void 648archetype::hash_add ()
800add_arch (archetype *at)
801{ 649{
802#if USE_UNORDERED_MAP 650 ht.insert (std::make_pair (name, this));
803 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 651}
804#endif
805 652
806 int 653void
807 index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 654archetype::hash_del ()
808 655{
809 for (;;) 656 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} 657}
824 658
825/* 659/*
826 * Returns the first archetype using the given type. 660 * Returns the first archetype using the given type.
827 * Used in treasure-generation. 661 * Used in treasure-generation.
828 */ 662 */
829
830archetype * 663archetype *
831type_to_archetype (int type) 664type_to_archetype (int type)
832{ 665{
833 archetype * 666 archetype *at;
834 at;
835 667
836 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 668 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
837 if (at->clone.type == type) 669 if (at->clone.type == type)
838 return at; 670 return at;
671
839 return NULL; 672 return 0;
840} 673}
841 674
842/* 675/*
843 * Returns a new object copied from the first archetype matching 676 * Returns a new object copied from the first archetype matching
844 * the given type. 677 * the given type.
… …
846 */ 679 */
847 680
848object * 681object *
849clone_arch (int type) 682clone_arch (int type)
850{ 683{
851 archetype * 684 archetype *at;
852 at;
853 object *
854 op = get_object ();
855 685
856 if ((at = type_to_archetype (type)) == NULL) 686 if ((at = type_to_archetype (type)) == NULL)
857 { 687 {
858 LOG (llevError, "Can't clone archetype %d\n", type); 688 LOG (llevError, "Can't clone archetype %d\n", type);
859 free_object (op);
860 return NULL; 689 return 0;
861 } 690 }
862 copy_object (&at->clone, op); 691
692 object *op = at->clone.clone ();
863 op->instantiate (); 693 op->instantiate ();
864 return op; 694 return op;
865} 695}
866 696
867/* 697/*
… …
869 */ 699 */
870 700
871object * 701object *
872object_create_arch (archetype *at) 702object_create_arch (archetype *at)
873{ 703{
874 object * 704 object *op, *prev = 0, *head = 0;
875 op, *
876 prev = NULL, *head = NULL;
877 705
878 while (at) 706 while (at)
879 { 707 {
880 op = arch_to_object (at); 708 op = arch_to_object (at);
881 op->x = at->clone.x; 709 op->x = at->clone.x;
882 op->y = at->clone.y; 710 op->y = at->clone.y;
711
883 if (head) 712 if (head)
884 op->head = head, prev->more = op; 713 op->head = head, prev->more = op;
714
885 if (!head) 715 if (!head)
886 head = op; 716 head = op;
717
887 prev = op; 718 prev = op;
888 at = at->more; 719 at = at->more;
889 } 720 }
721
890 return (head); 722 return (head);
891} 723}
892 724
893/*** end of arch.c ***/

Diff Legend

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