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.18 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.42 by root, Fri Feb 9 01:52:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <cassert> 25#include <cassert>
25 26
26#include <tr1/unordered_map>
27
28#include <global.h> 27#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 28#include <funcpoint.h>
31#include <loader.h> 29#include <loader.h>
32 30
33/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
34#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
35 33
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
42 35
43/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 41 * MSW 2003-04-29
49 */ 42 */
50 43
51#if USE_UNORDERED_MAP
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif
65 55
66/** 56/**
67 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 65 * - the archetype found or null if nothing was found.
76 */ 66 */
77archetype * 67archetype *
78find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
79{ 69{
80 archetype * 70 shstr_cmp name_cmp (name);
81 at;
82 71
83 if (name == NULL)
84 return (archetype *) NULL;
85
86 for (at = first_archetype; at != NULL; at = at->next) 72 for (archetype *at = first_archetype; at; at = at->next)
87 { 73 if (at->clone.name == name_cmp)
88 if (!strcmp (at->clone.name, name))
89 return at; 74 return at;
90 } 75
91 return NULL; 76 return 0;
92} 77}
93 78
94/** 79/**
95 * 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
96 * 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()
97 * except that it considers only items of the given type. 82 * except that it considers only items of the given type.
98 */ 83 */
99archetype * 84archetype *
100find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
101{ 86{
102 archetype * 87 shstr_cmp name_cmp (name);
103 at;
104 88
105 if (name == NULL)
106 return NULL;
107
108 for (at = first_archetype; at != NULL; at = at->next) 89 for (archetype *at = first_archetype; at; at = at->next)
109 { 90 if (at->clone.name == name_cmp && at->clone.type == type)
110 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
111 return at; 91 return at;
112 }
113 92
114 return NULL; 93 return 0;
115} 94}
116 95
117/* 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
118 * 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
119 * 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).
120 * If type is -1, ew don't match on type. 99 * If type is -1, ew don't match on type.
121 */ 100 */
122object * 101object *
123get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
124{ 103{
125 archetype * 104 shstr_cmp skill_cmp (skill);
126 at;
127 105
128 if (skill == NULL)
129 return NULL;
130
131 for (at = first_archetype; at != NULL; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
132 { 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
133 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
134 return arch_to_object (at); 108 return arch_to_object (at);
135 } 109
136 return NULL; 110 return 0;
137} 111}
138 112
139/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
140 * that matches both the type and subtype. type and subtype 114 * that matches both the type and subtype. type and subtype
141 * can be -1 to say ignore, but in this case, the match it does 115 * can be -1 to say ignore, but in this case, the match it does
… …
144 * (eg, skills) 118 * (eg, skills)
145 */ 119 */
146archetype * 120archetype *
147get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
148{ 122{
149 archetype *
150 at;
151
152 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
153 {
154 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))
155 return at; 125 return at;
156 } 126
157 return NULL; 127 return 0;
158} 128}
159 129
160/** 130/**
161 * 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
162 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
170 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
171 */ 141 */
172object * 142object *
173get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
174{ 144{
175 archetype *at;
176 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
177 int i; 146 int i;
178 147
179 assign (tmpname, name); 148 assign (tmpname, name);
180 149
181 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
182 { 151 {
183 tmpname[i] = 0; 152 tmpname[i] = 0;
153
184 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
185
186 if (at != NULL)
187 {
188 return arch_to_object (at); 155 return arch_to_object (at);
189 }
190 } 156 }
191 157
192 return create_singularity (name); 158 return create_singularity (name);
193} 159}
194 160
… …
210 * Last, make a check on the full name. 176 * Last, make a check on the full name.
211 */ 177 */
212int 178int
213item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
214{ 180{
215 char *
216 cp,
217 local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
218 int 182 int count, retval = 0;
219 count,
220 retval = 0;
221 183
222 strcpy (local_name, name); /* strtok is destructive to name */ 184 assign (local_name, name); /* strtok is destructive to name */
223 185
224 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 186 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
225 { 187 {
226 while (cp[0] == ' ') 188 while (cp[0] == ' ')
227 ++cp; /* get rid of spaces */ 189 ++cp; /* get rid of spaces */
… …
277 retval = 15; 239 retval = 15;
278 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 240 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
279 retval = 14; 241 retval = 14;
280 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 242 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
281 retval = 14; 243 retval = 14;
282
283 /* Do substring checks, so things like 'Str+1' will match. 244 /* Do substring checks, so things like 'Str+1' will match.
284 * retval of these should perhaps be lower - they are lower 245 * retval of these should perhaps be lower - they are lower
285 * then the specific strcasecmp aboves, but still higher than 246 * then the specific strcasecmp aboves, but still higher than
286 * some other match criteria. 247 * some other match criteria.
287 */ 248 */
… …
289 retval = 12; 250 retval = 12;
290 else if (strstr (query_base_name (op, 0), cp)) 251 else if (strstr (query_base_name (op, 0), cp))
291 retval = 12; 252 retval = 12;
292 else if (strstr (query_short_name (op), cp)) 253 else if (strstr (query_short_name (op), cp))
293 retval = 12; 254 retval = 12;
294
295 /* Check against plural/non plural based on count. */ 255 /* Check against plural/non plural based on count. */
296 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 256 else if (count > 1 && !strcasecmp (cp, op->name_pl))
297 {
298 retval = 6; 257 retval = 6;
299 }
300 else if (count == 1 && !strcasecmp (op->name, cp)) 258 else if (count == 1 && !strcasecmp (op->name, cp))
301 {
302 retval = 6; 259 retval = 6;
303 }
304 /* base name matched - not bad */ 260 /* base name matched - not bad */
305 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
306 retval = 4; 262 retval = 4;
307 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
308 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name && strstr (op->custom_name, cp))
… …
310 266
311 if (retval) 267 if (retval)
312 { 268 {
313 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
314 pl->contr->count = count; 270 pl->contr->count = count;
271
315 return retval; 272 return retval;
316 } 273 }
317 } 274 }
275
318 return 0; 276 return 0;
319} 277}
320 278
321/* 279/*
322 * Initialises the internal linked list of archetypes (read from file). 280 * Initialises the internal linked list of archetypes (read from file).
… …
327void 285void
328init_archetypes (void) 286init_archetypes (void)
329{ /* called from add_player() and edit() */ 287{ /* called from add_player() and edit() */
330 if (first_archetype != NULL) /* Only do this once */ 288 if (first_archetype != NULL) /* Only do this once */
331 return; 289 return;
290
332 arch_init = 1; 291 arch_init = 1;
333 load_archetypes (); 292 load_archetypes ();
334 arch_init = 0; 293 arch_init = 0;
335 empty_archetype = find_archetype ("empty_archetype"); 294 empty_archetype = archetype::find ("empty_archetype");
336 295
337/* init_blocksview();*/ 296/* init_blocksview();*/
338} 297}
339 298
340/* 299/*
341 * Stores debug-information about how efficient the hashtable
342 * used for archetypes has been in the static errmsg array.
343 */
344
345void
346arch_info (object *op)
347{
348 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
349 new_draw_info (NDI_BLACK, 0, op, errmsg);
350}
351
352/*
353 * Initialise the hashtable used by the archetypes.
354 */
355
356void
357clear_archetable (void)
358{
359 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
360}
361
362/*
363 * An alternative way to init the hashtable which is slower, but _works_... 300 * An alternative way to init the hashtable which is slower, but _works_...
364 */ 301 */
365
366void 302void
367init_archetable (void) 303init_archetable (void)
368{ 304{
369 archetype * 305 archetype *at;
370 at;
371 306
372 LOG (llevDebug, " Setting up archetable...\n"); 307 LOG (llevDebug, " Setting up archetable...\n");
373 308
374 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)
375 add_arch (at); 310 at->hash_add ();
376 311
377 LOG (llevDebug, "done\n"); 312 LOG (llevDebug, "done\n");
378} 313}
379 314
380/*
381 * Dumps an archetype to debug-level output.
382 */
383
384void
385dump_arch (archetype *at)
386{
387 dump_object (&at->clone);
388}
389
390/*
391 * Dumps _all_ archetypes to debug-level output.
392 * If you run crossfire with debug, and enter DM-mode, you can trigger
393 * this with the O key.
394 */
395
396void
397dump_all_archetypes (void)
398{
399 archetype *
400 at;
401
402 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
403 {
404 dump_arch (at);
405 fprintf (logfile, "%s\n", errmsg);
406 }
407}
408
409void 315void
410free_all_archs (void) 316free_all_archs (void)
411{ 317{
412 archetype * 318 archetype *at, *next;
413 at, *
414 next;
415 int
416 i = 0, f = 0; 319 int i = 0, f = 0;
417 320
418 for (at = first_archetype; at != NULL; at = next) 321 for (at = first_archetype; at; at = next)
419 { 322 {
420 if (at->more) 323 if (at->more)
421 next = at->more; 324 next = at->more;
422 else 325 else
423 next = at->next; 326 next = at->next;
… …
425 delete 328 delete
426 at; 329 at;
427 330
428 i++; 331 i++;
429 } 332 }
333
430 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 334 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
431} 335}
432 336
433archetype::archetype () 337archetype::archetype ()
434{ 338{
435 clear_object (&clone); /* to initial state other also */
436 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 */
437 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 340 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
438} 341}
439 342
440archetype::~archetype () 343archetype::~archetype ()
441{ 344{
… …
446 * of archetype-structures. 349 * of archetype-structures.
447 */ 350 */
448void 351void
449first_arch_pass (object_thawer & fp) 352first_arch_pass (object_thawer & fp)
450{ 353{
451 archetype * 354 archetype *head = 0, *last_more = 0;
452 at, *
453 head = NULL, *last_more = NULL;
454 355
356 archetype *at = new archetype;
455 at->clone.arch = first_archetype = at = new archetype; 357 at->clone.arch = first_archetype = at;
456 358
457 while (int i = load_object (fp, &at->clone, 0)) 359 while (int i = load_object (fp, &at->clone, 0))
458 { 360 {
459 at->clone.speed_left = (float) (-0.1); 361 at->clone.speed_left = (float) (-0.1);
460 /* 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
… …
527 */ 429 */
528 430
529void 431void
530second_arch_pass (object_thawer & thawer) 432second_arch_pass (object_thawer & thawer)
531{ 433{
532 char
533 buf[MAX_BUF], *
534 variable = buf, *argument, *cp; 434 char buf[MAX_BUF], *variable = buf, *argument, *cp;
535 archetype *
536 at = NULL, *other; 435 archetype *at = NULL, *other;
537 436
538 while (fgets (buf, MAX_BUF, thawer) != NULL) 437 while (fgets (buf, MAX_BUF, thawer) != NULL)
539 { 438 {
540 if (*buf == '#') 439 if (*buf == '#')
541 continue; 440 continue;
441
542 if ((argument = strchr (buf, ' ')) != NULL) 442 if ((argument = strchr (buf, ' ')) != NULL)
543 { 443 {
544 *argument = '\0', argument++; 444 *argument = '\0', argument++;
545 cp = argument + strlen (argument) - 1; 445 cp = argument + strlen (argument) - 1;
546 while (isspace (*cp)) 446 while (isspace (*cp))
547 { 447 {
548 *cp = '\0'; 448 *cp = '\0';
549 cp--; 449 cp--;
550 } 450 }
551 } 451 }
452
552 if (!strcmp ("Object", variable)) 453 if (!strcmp ("object", variable))
553 { 454 {
554 if ((at = find_archetype (argument)) == NULL) 455 if ((at = archetype::find (argument)) == NULL)
555 LOG (llevError, "Warning: failed to find arch %s\n", argument); 456 LOG (llevError, "Warning: failed to find arch %s\n", argument);
556 } 457 }
557 else if (!strcmp ("other_arch", variable)) 458 else if (!strcmp ("other_arch", variable))
558 { 459 {
559 if (at != NULL && at->clone.other_arch == NULL) 460 if (at != NULL && at->clone.other_arch == NULL)
560 { 461 {
561 if ((other = find_archetype (argument)) == NULL) 462 if ((other = archetype::find (argument)) == NULL)
562 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 463 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
563 else if (at != NULL) 464 else if (at != NULL)
564 at->clone.other_arch = other; 465 at->clone.other_arch = other;
565 } 466 }
566 } 467 }
567 else if (!strcmp ("randomitems", variable)) 468 else if (!strcmp ("randomitems", variable))
568 { 469 {
569 if (at != NULL) 470 if (at)
570 { 471 {
571 treasurelist *
572 tl = find_treasurelist (argument); 472 treasurelist *tl = find_treasurelist (argument);
573 473
574 if (tl == NULL) 474 if (tl == NULL)
575 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);
576 else 476 else
577 at->clone.randomitems = tl; 477 at->clone.randomitems = tl;
… …
582 482
583#ifdef DEBUG 483#ifdef DEBUG
584void 484void
585check_generators (void) 485check_generators (void)
586{ 486{
587 archetype * 487 archetype *at;
588 at;
589 488
590 for (at = first_archetype; at != NULL; at = at->next) 489 for (at = first_archetype; at != NULL; at = at->next)
591 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)
592 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);
593} 492}
… …
601 */ 500 */
602 501
603void 502void
604load_archetypes (void) 503load_archetypes (void)
605{ 504{
606 char
607 filename[MAX_BUF]; 505 char filename[MAX_BUF];
608
609#if TIME_ARCH_LOAD
610 struct timeval
611 tv1,
612 tv2;
613#endif
614 506
615 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 507 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
616 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 508 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
617 509
618 { 510 {
619 object_thawer 511 object_thawer
620 thawer (filename); 512 thawer (filename);
621 513
622 clear_archetable ();
623 LOG (llevDebug, " arch-pass 1...\n"); 514 LOG (llevDebug, " arch-pass 1...\n");
624 first_arch_pass (thawer); 515 first_arch_pass (thawer);
625 LOG (llevDebug, " done\n"); 516 LOG (llevDebug, " done\n");
626 } 517 }
627 518
… …
632 object_thawer 523 object_thawer
633 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