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

Diff Legend

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