1 | |
|
|
2 | /* |
|
|
3 | * static char *rcsid_arch_c = |
|
|
4 | * "$Id: arch.C,v 1.15 2006/09/10 13:20:12 root Exp $"; |
|
|
5 | */ |
|
|
6 | |
|
|
7 | /* |
1 | /* |
8 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
9 | |
3 | |
10 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
11 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
22 | |
16 | |
23 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License |
24 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
25 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | |
20 | |
27 | The authors can be reached via e-mail at crossfire-devel@real-time.com |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
28 | */ |
22 | */ |
29 | |
23 | |
30 | #include <cassert> |
24 | #include <cassert> |
31 | |
25 | |
32 | #include <tr1/unordered_map> |
26 | #include <tr1/unordered_map> |
… | |
… | |
54 | * MSW 2003-04-29 |
48 | * MSW 2003-04-29 |
55 | */ |
49 | */ |
56 | |
50 | |
57 | #if USE_UNORDERED_MAP |
51 | #if USE_UNORDERED_MAP |
58 | // the hashtable |
52 | // the hashtable |
59 | typedef |
|
|
60 | std::tr1::unordered_map < |
53 | typedef std::tr1::unordered_map |
61 | size_t, archetype *> |
54 | < |
|
|
55 | std::size_t, |
|
|
56 | archetype *, |
|
|
57 | std::hash<size_t>, |
|
|
58 | std::equal_to<size_t>, |
|
|
59 | slice_allocator< std::pair<const std::size_t, archetype *> > |
|
|
60 | true, |
62 | HT; |
61 | > HT; |
63 | |
62 | |
64 | static HT |
63 | static HT ht; |
65 | ht; |
|
|
66 | #endif |
64 | #endif |
67 | |
65 | |
68 | /** |
66 | /** |
69 | * GROS - This function retrieves an archetype given the name that appears |
67 | * GROS - This function retrieves an archetype given the name that appears |
70 | * during the game (for example, "writing pen" instead of "stylus"). |
68 | * during the game (for example, "writing pen" instead of "stylus"). |
… | |
… | |
77 | * - the archetype found or null if nothing was found. |
75 | * - the archetype found or null if nothing was found. |
78 | */ |
76 | */ |
79 | archetype * |
77 | archetype * |
80 | find_archetype_by_object_name (const char *name) |
78 | find_archetype_by_object_name (const char *name) |
81 | { |
79 | { |
82 | archetype * |
80 | archetype *at; |
83 | at; |
|
|
84 | |
81 | |
85 | if (name == NULL) |
82 | if (name == NULL) |
86 | return (archetype *) NULL; |
83 | return (archetype *) NULL; |
87 | |
84 | |
88 | for (at = first_archetype; at != NULL; at = at->next) |
85 | for (at = first_archetype; at != NULL; at = at->next) |
… | |
… | |
99 | * except that it considers only items of the given type. |
96 | * except that it considers only items of the given type. |
100 | */ |
97 | */ |
101 | archetype * |
98 | archetype * |
102 | find_archetype_by_object_type_name (int type, const char *name) |
99 | find_archetype_by_object_type_name (int type, const char *name) |
103 | { |
100 | { |
104 | archetype * |
101 | archetype *at; |
105 | at; |
|
|
106 | |
102 | |
107 | if (name == NULL) |
103 | if (name == NULL) |
108 | return NULL; |
104 | return NULL; |
109 | |
105 | |
110 | for (at = first_archetype; at != NULL; at = at->next) |
106 | for (at = first_archetype; at != NULL; at = at->next) |
… | |
… | |
172 | * but it otherwise had a big memory leak. |
168 | * but it otherwise had a big memory leak. |
173 | */ |
169 | */ |
174 | object * |
170 | object * |
175 | get_archetype_by_object_name (const char *name) |
171 | get_archetype_by_object_name (const char *name) |
176 | { |
172 | { |
177 | archetype * |
173 | archetype *at; |
178 | at; |
|
|
179 | char |
|
|
180 | tmpname[MAX_BUF]; |
174 | char tmpname[MAX_BUF]; |
181 | int |
175 | int i; |
182 | i; |
|
|
183 | |
176 | |
184 | strncpy (tmpname, name, MAX_BUF - 1); |
177 | assign (tmpname, name); |
185 | tmpname[MAX_BUF - 1] = 0; |
178 | |
186 | for (i = strlen (tmpname); i > 0; i--) |
179 | for (i = strlen (tmpname); i > 0; i--) |
187 | { |
180 | { |
188 | tmpname[i] = 0; |
181 | tmpname[i] = 0; |
189 | at = find_archetype_by_object_name (tmpname); |
182 | at = find_archetype_by_object_name (tmpname); |
|
|
183 | |
190 | if (at != NULL) |
184 | if (at != NULL) |
191 | { |
|
|
192 | return arch_to_object (at); |
185 | return arch_to_object (at); |
193 | } |
|
|
194 | } |
186 | } |
|
|
187 | |
195 | return create_singularity (name); |
188 | return create_singularity (name); |
196 | } |
189 | } |
197 | |
190 | |
198 | /* This is a subset of the parse_id command. Basically, name can be |
191 | /* 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. |
192 | * a string seperated lists of things to match, with certain keywords. |
… | |
… | |
213 | * Last, make a check on the full name. |
206 | * Last, make a check on the full name. |
214 | */ |
207 | */ |
215 | int |
208 | int |
216 | item_matched_string (object *pl, object *op, const char *name) |
209 | item_matched_string (object *pl, object *op, const char *name) |
217 | { |
210 | { |
218 | char * |
|
|
219 | cp, |
|
|
220 | local_name[MAX_BUF]; |
211 | char *cp, local_name[MAX_BUF]; |
221 | int |
212 | int count, retval = 0; |
222 | count, |
|
|
223 | retval = 0; |
|
|
224 | |
213 | |
225 | strcpy (local_name, name); /* strtok is destructive to name */ |
214 | strcpy (local_name, name); /* strtok is destructive to name */ |
226 | |
215 | |
227 | for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) |
216 | for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) |
228 | { |
217 | { |
… | |
… | |
280 | retval = 15; |
269 | retval = 15; |
281 | else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) |
270 | else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) |
282 | retval = 14; |
271 | retval = 14; |
283 | else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) |
272 | else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) |
284 | retval = 14; |
273 | retval = 14; |
285 | |
|
|
286 | /* Do substring checks, so things like 'Str+1' will match. |
274 | /* Do substring checks, so things like 'Str+1' will match. |
287 | * retval of these should perhaps be lower - they are lower |
275 | * retval of these should perhaps be lower - they are lower |
288 | * then the specific strcasecmp aboves, but still higher than |
276 | * then the specific strcasecmp aboves, but still higher than |
289 | * some other match criteria. |
277 | * some other match criteria. |
290 | */ |
278 | */ |
… | |
… | |
292 | retval = 12; |
280 | retval = 12; |
293 | else if (strstr (query_base_name (op, 0), cp)) |
281 | else if (strstr (query_base_name (op, 0), cp)) |
294 | retval = 12; |
282 | retval = 12; |
295 | else if (strstr (query_short_name (op), cp)) |
283 | else if (strstr (query_short_name (op), cp)) |
296 | retval = 12; |
284 | retval = 12; |
297 | |
|
|
298 | /* Check against plural/non plural based on count. */ |
285 | /* Check against plural/non plural based on count. */ |
299 | else if (count > 1 && !strcasecmp (cp, op->name_pl)) |
286 | else if (count > 1 && !strcasecmp (cp, op->name_pl)) |
300 | { |
|
|
301 | retval = 6; |
287 | retval = 6; |
302 | } |
|
|
303 | else if (count == 1 && !strcasecmp (op->name, cp)) |
288 | else if (count == 1 && !strcasecmp (op->name, cp)) |
304 | { |
|
|
305 | retval = 6; |
289 | retval = 6; |
306 | } |
|
|
307 | /* base name matched - not bad */ |
290 | /* base name matched - not bad */ |
308 | else if (strcasecmp (cp, op->name) == 0 && !count) |
291 | else if (strcasecmp (cp, op->name) == 0 && !count) |
309 | retval = 4; |
292 | retval = 4; |
310 | /* Check for partial custom name, but give a real low priority */ |
293 | /* Check for partial custom name, but give a real low priority */ |
311 | else if (op->custom_name && strstr (op->custom_name, cp)) |
294 | else if (op->custom_name && strstr (op->custom_name, cp)) |
… | |
… | |
313 | |
296 | |
314 | if (retval) |
297 | if (retval) |
315 | { |
298 | { |
316 | if (pl->type == PLAYER) |
299 | if (pl->type == PLAYER) |
317 | pl->contr->count = count; |
300 | pl->contr->count = count; |
|
|
301 | |
318 | return retval; |
302 | return retval; |
319 | } |
303 | } |
320 | } |
304 | } |
|
|
305 | |
321 | return 0; |
306 | return 0; |
322 | } |
307 | } |
323 | |
308 | |
324 | /* |
309 | /* |
325 | * Initialises the internal linked list of archetypes (read from file). |
310 | * Initialises the internal linked list of archetypes (read from file). |
… | |
… | |
330 | void |
315 | void |
331 | init_archetypes (void) |
316 | init_archetypes (void) |
332 | { /* called from add_player() and edit() */ |
317 | { /* called from add_player() and edit() */ |
333 | if (first_archetype != NULL) /* Only do this once */ |
318 | if (first_archetype != NULL) /* Only do this once */ |
334 | return; |
319 | return; |
|
|
320 | |
335 | arch_init = 1; |
321 | arch_init = 1; |
336 | load_archetypes (); |
322 | load_archetypes (); |
337 | arch_init = 0; |
323 | arch_init = 0; |
338 | empty_archetype = find_archetype ("empty_archetype"); |
324 | empty_archetype = archetype::find ("empty_archetype"); |
339 | |
325 | |
340 | /* init_blocksview();*/ |
326 | /* init_blocksview();*/ |
341 | } |
327 | } |
342 | |
328 | |
343 | /* |
329 | /* |
… | |
… | |
367 | */ |
353 | */ |
368 | |
354 | |
369 | void |
355 | void |
370 | init_archetable (void) |
356 | init_archetable (void) |
371 | { |
357 | { |
372 | archetype * |
358 | archetype *at; |
373 | at; |
|
|
374 | |
359 | |
375 | LOG (llevDebug, " Setting up archetable...\n"); |
360 | LOG (llevDebug, " Setting up archetable...\n"); |
376 | |
361 | |
377 | for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) |
362 | for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) |
378 | add_arch (at); |
363 | add_arch (at); |
379 | |
364 | |
380 | LOG (llevDebug, "done\n"); |
365 | LOG (llevDebug, "done\n"); |
381 | } |
366 | } |
382 | |
367 | |
383 | /* |
|
|
384 | * Dumps an archetype to debug-level output. |
|
|
385 | */ |
|
|
386 | |
|
|
387 | void |
|
|
388 | dump_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 | |
|
|
399 | void |
|
|
400 | dump_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 | |
|
|
412 | void |
368 | void |
413 | free_all_archs (void) |
369 | free_all_archs (void) |
414 | { |
370 | { |
415 | archetype * |
371 | archetype *at, *next; |
416 | at, * |
|
|
417 | next; |
|
|
418 | int |
|
|
419 | i = 0, f = 0; |
372 | int i = 0, f = 0; |
420 | |
373 | |
421 | for (at = first_archetype; at != NULL; at = next) |
374 | for (at = first_archetype; at != NULL; at = next) |
422 | { |
375 | { |
423 | if (at->more) |
376 | if (at->more) |
424 | next = at->more; |
377 | next = at->more; |
425 | else |
378 | else |
426 | next = at->next; |
379 | next = at->next; |
427 | |
380 | |
428 | delete at; |
381 | delete |
|
|
382 | at; |
|
|
383 | |
429 | i++; |
384 | i++; |
430 | } |
385 | } |
431 | LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); |
386 | LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); |
432 | } |
387 | } |
433 | |
388 | |
… | |
… | |
447 | * of archetype-structures. |
402 | * of archetype-structures. |
448 | */ |
403 | */ |
449 | void |
404 | void |
450 | first_arch_pass (object_thawer & fp) |
405 | first_arch_pass (object_thawer & fp) |
451 | { |
406 | { |
452 | archetype * |
|
|
453 | at, * |
|
|
454 | head = NULL, *last_more = NULL; |
407 | archetype *at, *head = NULL, *last_more = NULL; |
455 | |
408 | |
456 | at->clone.arch = first_archetype = at = new archetype; |
409 | at->clone.arch = first_archetype = at = new archetype; |
457 | |
410 | |
458 | while (int i = load_object (fp, &at->clone, 0)) |
411 | while (int i = load_object (fp, &at->clone, 0)) |
459 | { |
412 | { |
… | |
… | |
517 | at = new archetype; |
470 | at = new archetype; |
518 | |
471 | |
519 | at->clone.arch = at; |
472 | at->clone.arch = at; |
520 | } |
473 | } |
521 | |
474 | |
522 | delete |
475 | delete at; |
523 | at; |
|
|
524 | } |
476 | } |
525 | |
477 | |
526 | /* |
478 | /* |
527 | * Reads the archetype file once more, and links all pointers between |
479 | * Reads the archetype file once more, and links all pointers between |
528 | * archetypes. |
480 | * archetypes. |
529 | */ |
481 | */ |
530 | |
482 | |
531 | void |
483 | void |
532 | second_arch_pass (object_thawer & thawer) |
484 | second_arch_pass (object_thawer & thawer) |
533 | { |
485 | { |
534 | char |
|
|
535 | buf[MAX_BUF], * |
|
|
536 | variable = buf, *argument, *cp; |
486 | char buf[MAX_BUF], *variable = buf, *argument, *cp; |
537 | archetype * |
|
|
538 | at = NULL, *other; |
487 | archetype *at = NULL, *other; |
539 | |
488 | |
540 | while (fgets (buf, MAX_BUF, thawer) != NULL) |
489 | while (fgets (buf, MAX_BUF, thawer) != NULL) |
541 | { |
490 | { |
542 | if (*buf == '#') |
491 | if (*buf == '#') |
543 | continue; |
492 | continue; |
… | |
… | |
551 | cp--; |
500 | cp--; |
552 | } |
501 | } |
553 | } |
502 | } |
554 | if (!strcmp ("Object", variable)) |
503 | if (!strcmp ("Object", variable)) |
555 | { |
504 | { |
556 | if ((at = find_archetype (argument)) == NULL) |
505 | if ((at = archetype::find (argument)) == NULL) |
557 | LOG (llevError, "Warning: failed to find arch %s\n", argument); |
506 | LOG (llevError, "Warning: failed to find arch %s\n", argument); |
558 | } |
507 | } |
559 | else if (!strcmp ("other_arch", variable)) |
508 | else if (!strcmp ("other_arch", variable)) |
560 | { |
509 | { |
561 | if (at != NULL && at->clone.other_arch == NULL) |
510 | if (at != NULL && at->clone.other_arch == NULL) |
562 | { |
511 | { |
563 | if ((other = find_archetype (argument)) == NULL) |
512 | if ((other = archetype::find (argument)) == NULL) |
564 | LOG (llevError, "Warning: failed to find other_arch %s\n", argument); |
513 | LOG (llevError, "Warning: failed to find other_arch %s\n", argument); |
565 | else if (at != NULL) |
514 | else if (at != NULL) |
566 | at->clone.other_arch = other; |
515 | at->clone.other_arch = other; |
567 | } |
516 | } |
568 | } |
517 | } |
569 | else if (!strcmp ("randomitems", variable)) |
518 | else if (!strcmp ("randomitems", variable)) |
570 | { |
519 | { |
571 | if (at != NULL) |
520 | if (at != NULL) |
572 | { |
521 | { |
573 | treasurelist * |
|
|
574 | tl = find_treasurelist (argument); |
522 | treasurelist *tl = find_treasurelist (argument); |
575 | |
523 | |
576 | if (tl == NULL) |
524 | if (tl == NULL) |
577 | LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); |
525 | LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); |
578 | else |
526 | else |
579 | at->clone.randomitems = tl; |
527 | at->clone.randomitems = tl; |
… | |
… | |
584 | |
532 | |
585 | #ifdef DEBUG |
533 | #ifdef DEBUG |
586 | void |
534 | void |
587 | check_generators (void) |
535 | check_generators (void) |
588 | { |
536 | { |
589 | archetype * |
537 | archetype *at; |
590 | at; |
|
|
591 | |
538 | |
592 | for (at = first_archetype; at != NULL; at = at->next) |
539 | for (at = first_archetype; at != NULL; at = at->next) |
593 | if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) |
540 | 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); |
541 | LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); |
595 | } |
542 | } |
… | |
… | |
603 | */ |
550 | */ |
604 | |
551 | |
605 | void |
552 | void |
606 | load_archetypes (void) |
553 | load_archetypes (void) |
607 | { |
554 | { |
608 | char |
|
|
609 | filename[MAX_BUF]; |
555 | char filename[MAX_BUF]; |
610 | |
556 | |
611 | #if TIME_ARCH_LOAD |
557 | #if TIME_ARCH_LOAD |
612 | struct timeval |
558 | struct timeval |
613 | tv1, |
559 | tv1, |
614 | tv2; |
560 | tv2; |
… | |
… | |
616 | |
562 | |
617 | sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); |
563 | sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); |
618 | LOG (llevDebug, "Reading archetypes from %s:\n", filename); |
564 | LOG (llevDebug, "Reading archetypes from %s:\n", filename); |
619 | |
565 | |
620 | { |
566 | { |
|
|
567 | object_thawer |
621 | object_thawer thawer (filename); |
568 | thawer (filename); |
622 | |
569 | |
623 | clear_archetable (); |
570 | clear_archetable (); |
624 | LOG (llevDebug, " arch-pass 1...\n"); |
571 | LOG (llevDebug, " arch-pass 1...\n"); |
625 | first_arch_pass (thawer); |
572 | first_arch_pass (thawer); |
626 | LOG (llevDebug, " done\n"); |
573 | LOG (llevDebug, " done\n"); |
… | |
… | |
628 | |
575 | |
629 | init_archetable (); |
576 | init_archetable (); |
630 | warn_archetypes = 1; |
577 | warn_archetypes = 1; |
631 | |
578 | |
632 | { |
579 | { |
|
|
580 | object_thawer |
633 | object_thawer thawer (filename); |
581 | thawer (filename); |
634 | |
582 | |
635 | LOG (llevDebug, " loading treasure...\n"); |
583 | LOG (llevDebug, " loading treasure...\n"); |
636 | load_treasures (); |
584 | load_treasures (); |
637 | LOG (llevDebug, " done\n arch-pass 2...\n"); |
585 | LOG (llevDebug, " done\n arch-pass 2...\n"); |
638 | second_arch_pass (thawer); |
586 | second_arch_pass (thawer); |
… | |
… | |
650 | */ |
598 | */ |
651 | |
599 | |
652 | object * |
600 | object * |
653 | arch_to_object (archetype *at) |
601 | arch_to_object (archetype *at) |
654 | { |
602 | { |
655 | object * |
603 | object *op; |
656 | op; |
|
|
657 | |
604 | |
658 | if (at == NULL) |
605 | if (at == NULL) |
659 | { |
606 | { |
660 | if (warn_archetypes) |
607 | if (warn_archetypes) |
661 | LOG (llevError, "Couldn't find archetype.\n"); |
608 | LOG (llevError, "Couldn't find archetype.\n"); |
… | |
… | |
678 | */ |
625 | */ |
679 | |
626 | |
680 | object * |
627 | object * |
681 | create_singularity (const char *name) |
628 | create_singularity (const char *name) |
682 | { |
629 | { |
683 | object * |
630 | object *op; |
684 | op; |
|
|
685 | char |
|
|
686 | buf[MAX_BUF]; |
631 | char buf[MAX_BUF]; |
687 | |
632 | |
688 | sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); |
633 | sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); |
689 | op = get_object (); |
634 | op = get_object (); |
690 | op->name = op->name_pl = buf; |
635 | op->name = op->name_pl = buf; |
691 | SET_FLAG (op, FLAG_NO_PICK); |
636 | SET_FLAG (op, FLAG_NO_PICK); |
… | |
… | |
698 | */ |
643 | */ |
699 | |
644 | |
700 | object * |
645 | object * |
701 | get_archetype (const char *name) |
646 | get_archetype (const char *name) |
702 | { |
647 | { |
703 | archetype * |
648 | archetype *at = archetype::find (name); |
704 | at; |
|
|
705 | |
649 | |
706 | at = find_archetype (name); |
650 | if (!at) |
707 | if (at == NULL) |
|
|
708 | return create_singularity (name); |
651 | return create_singularity (name); |
709 | |
652 | |
710 | return arch_to_object (at); |
653 | return arch_to_object (at); |
711 | } |
654 | } |
712 | |
655 | |
… | |
… | |
715 | */ |
658 | */ |
716 | |
659 | |
717 | unsigned long |
660 | unsigned long |
718 | hasharch (const char *str, int tablesize) |
661 | hasharch (const char *str, int tablesize) |
719 | { |
662 | { |
720 | unsigned long |
663 | unsigned long hash = 0; |
721 | hash = 0; |
|
|
722 | unsigned int |
664 | unsigned int i = 0; |
723 | i = 0; |
|
|
724 | const char * |
665 | const char *p; |
725 | p; |
|
|
726 | |
666 | |
727 | /* use the one-at-a-time hash function, which supposedly is |
667 | /* use the one-at-a-time hash function, which supposedly is |
728 | * better than the djb2-like one used by perl5.005, but |
668 | * better than the djb2-like one used by perl5.005, but |
729 | * certainly is better then the bug used here before. |
669 | * certainly is better then the bug used here before. |
730 | * see http://burtleburtle.net/bob/hash/doobs.html |
670 | * see http://burtleburtle.net/bob/hash/doobs.html |
… | |
… | |
747 | * Finds, using the hashtable, which archetype matches the given name. |
687 | * Finds, using the hashtable, which archetype matches the given name. |
748 | * returns a pointer to the found archetype, otherwise NULL. |
688 | * returns a pointer to the found archetype, otherwise NULL. |
749 | */ |
689 | */ |
750 | |
690 | |
751 | archetype * |
691 | archetype * |
752 | find_archetype (const char *name) |
692 | archetype::find (const char *name) |
753 | { |
693 | { |
754 | #if USE_UNORDERED_MAP |
|
|
755 | name = shstr::find (name); |
|
|
756 | |
|
|
757 | if (!name) |
694 | if (!name) |
758 | return 0; |
695 | return 0; |
759 | |
696 | |
760 | HT::const_iterator i = ht.find ((size_t) name); |
697 | #if USE_UNORDERED_MAP |
|
|
698 | AUTODECL (i, ht.find ((size_t) name)); |
761 | |
699 | |
762 | if (i == ht.end ()) |
700 | if (i == ht.end ()) |
763 | return 0; |
701 | return 0; |
764 | else |
702 | else |
765 | return i->second; |
703 | return i->second; |
766 | #endif |
704 | #endif |
767 | |
705 | |
768 | archetype * |
706 | archetype *at; |
769 | at; |
|
|
770 | unsigned long |
707 | unsigned long index; |
771 | index; |
|
|
772 | |
|
|
773 | if (name == NULL) |
|
|
774 | return (archetype *) NULL; |
|
|
775 | |
708 | |
776 | index = hasharch (name, ARCHTABLE); |
709 | index = hasharch (name, ARCHTABLE); |
777 | arch_search++; |
710 | arch_search++; |
778 | for (;;) |
711 | for (;;) |
779 | { |
712 | { |
780 | at = arch_table[index]; |
713 | at = arch_table[index]; |
|
|
714 | |
781 | if (at == NULL) |
715 | if (at == NULL) |
782 | { |
716 | { |
783 | if (warn_archetypes) |
717 | if (warn_archetypes) |
784 | LOG (llevError, "Couldn't find archetype %s\n", name); |
718 | LOG (llevError, "Couldn't find archetype %s\n", name); |
|
|
719 | |
785 | return NULL; |
720 | return NULL; |
786 | } |
721 | } |
|
|
722 | |
787 | arch_cmp++; |
723 | arch_cmp++; |
|
|
724 | |
788 | if (!strcmp ((const char *) at->name, name)) |
725 | if (!strcmp ((const char *) at->name, name)) |
789 | return at; |
726 | return at; |
|
|
727 | |
790 | if (++index >= ARCHTABLE) |
728 | if (++index >= ARCHTABLE) |
791 | index = 0; |
729 | index = 0; |
792 | } |
730 | } |
793 | } |
731 | } |
794 | |
732 | |
… | |
… | |
801 | { |
739 | { |
802 | #if USE_UNORDERED_MAP |
740 | #if USE_UNORDERED_MAP |
803 | ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); |
741 | ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); |
804 | #endif |
742 | #endif |
805 | |
743 | |
806 | int |
|
|
807 | index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; |
744 | int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; |
808 | |
745 | |
809 | for (;;) |
746 | for (;;) |
810 | { |
747 | { |
811 | if (arch_table[index] == NULL) |
748 | if (arch_table[index] == NULL) |
812 | { |
749 | { |
… | |
… | |
828 | */ |
765 | */ |
829 | |
766 | |
830 | archetype * |
767 | archetype * |
831 | type_to_archetype (int type) |
768 | type_to_archetype (int type) |
832 | { |
769 | { |
833 | archetype * |
770 | archetype *at; |
834 | at; |
|
|
835 | |
771 | |
836 | for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) |
772 | for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) |
837 | if (at->clone.type == type) |
773 | if (at->clone.type == type) |
838 | return at; |
774 | return at; |
|
|
775 | |
839 | return NULL; |
776 | return 0; |
840 | } |
777 | } |
841 | |
778 | |
842 | /* |
779 | /* |
843 | * Returns a new object copied from the first archetype matching |
780 | * Returns a new object copied from the first archetype matching |
844 | * the given type. |
781 | * the given type. |
… | |
… | |
846 | */ |
783 | */ |
847 | |
784 | |
848 | object * |
785 | object * |
849 | clone_arch (int type) |
786 | clone_arch (int type) |
850 | { |
787 | { |
851 | archetype * |
788 | archetype *at; |
852 | at; |
|
|
853 | object * |
|
|
854 | op = get_object (); |
789 | object *op = get_object (); |
855 | |
790 | |
856 | if ((at = type_to_archetype (type)) == NULL) |
791 | if ((at = type_to_archetype (type)) == NULL) |
857 | { |
792 | { |
858 | LOG (llevError, "Can't clone archetype %d\n", type); |
793 | LOG (llevError, "Can't clone archetype %d\n", type); |
859 | free_object (op); |
794 | free_object (op); |
860 | return NULL; |
795 | return NULL; |
861 | } |
796 | } |
|
|
797 | |
862 | copy_object (&at->clone, op); |
798 | copy_object (&at->clone, op); |
863 | op->instantiate (); |
799 | op->instantiate (); |
864 | return op; |
800 | return op; |
865 | } |
801 | } |
866 | |
802 | |
… | |
… | |
869 | */ |
805 | */ |
870 | |
806 | |
871 | object * |
807 | object * |
872 | object_create_arch (archetype *at) |
808 | object_create_arch (archetype *at) |
873 | { |
809 | { |
874 | object * |
810 | object *op, *prev = 0, *head = 0; |
875 | op, * |
|
|
876 | prev = NULL, *head = NULL; |
|
|
877 | |
811 | |
878 | while (at) |
812 | while (at) |
879 | { |
813 | { |
880 | op = arch_to_object (at); |
814 | op = arch_to_object (at); |
881 | op->x = at->clone.x; |
815 | op->x = at->clone.x; |
882 | op->y = at->clone.y; |
816 | op->y = at->clone.y; |
|
|
817 | |
883 | if (head) |
818 | if (head) |
884 | op->head = head, prev->more = op; |
819 | op->head = head, prev->more = op; |
|
|
820 | |
885 | if (!head) |
821 | if (!head) |
886 | head = op; |
822 | head = op; |
|
|
823 | |
887 | prev = op; |
824 | prev = op; |
888 | at = at->more; |
825 | at = at->more; |
889 | } |
826 | } |
|
|
827 | |
890 | return (head); |
828 | return (head); |
891 | } |
829 | } |
892 | |
830 | |
893 | /*** end of arch.c ***/ |
|
|