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.12 by root, Mon Sep 4 17:16:19 2006 UTC vs.
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC

1/* 1/*
2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.12 2006/09/04 17:16:19 root Exp $";
4 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
8 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
11 7 *
12 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
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21 *
26 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>
27*/ 23 */
28 24
29#include <cassert> 25#include <cassert>
30 26
31#include <tr1/unordered_map>
32
33#include <global.h> 27#include <global.h>
34#include <arch.h>
35#include <funcpoint.h> 28#include <funcpoint.h>
36#include <loader.h> 29#include <loader.h>
37 30
38/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
39#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
40 33
41static void add_arch (archetype * at);
42
43static archetype *arch_table[ARCHTABLE];
44int arch_cmp = 0; /* How many strcmp's */
45int arch_search = 0; /* How many searches */
46int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
47 35
48/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
49 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
50 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
51 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
52 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
53 * MSW 2003-04-29 41 * MSW 2003-04-29
54 */ 42 */
55 43
56#if USE_UNORDERED_MAP
57// the hashtable 44// the hashtable
58typedef std::tr1::unordered_map<size_t, archetype *> HT; 45typedef std::tr1::unordered_map
46 <
47 const char *,
48 arch_ptr,
49 str_hash,
50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT;
59 53
60static HT ht; 54static HT ht (5000);
61#endif
62 55
63/** 56/**
64 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
65 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
66 * 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.
… …
115 * If type is -1, ew don't match on type. 108 * If type is -1, ew don't match on type.
116 */ 109 */
117object * 110object *
118get_archetype_by_skill_name (const char *skill, int type) 111get_archetype_by_skill_name (const char *skill, int type)
119{ 112{
120 archetype * 113 archetype *at;
121 at;
122 114
123 if (skill == NULL) 115 if (skill)
124 return NULL;
125
126 for (at = first_archetype; at != NULL; at = at->next) 116 for (at = first_archetype; at; at = at->next)
127 {
128 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 117 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
129 return arch_to_object (at); 118 return arch_to_object (at);
130 } 119
131 return NULL; 120 return 0;
132} 121}
133 122
134/* similiar to above - this returns the first archetype 123/* similiar to above - this returns the first archetype
135 * that matches both the type and subtype. type and subtype 124 * that matches both the type and subtype. type and subtype
136 * can be -1 to say ignore, but in this case, the match it does 125 * can be -1 to say ignore, but in this case, the match it does
… …
165 * but it otherwise had a big memory leak. 154 * but it otherwise had a big memory leak.
166 */ 155 */
167object * 156object *
168get_archetype_by_object_name (const char *name) 157get_archetype_by_object_name (const char *name)
169{ 158{
170 archetype * 159 archetype *at;
171 at;
172 char
173 tmpname[MAX_BUF]; 160 char tmpname[MAX_BUF];
174 int 161 int i;
175 i;
176 162
177 strncpy (tmpname, name, MAX_BUF - 1); 163 assign (tmpname, name);
178 tmpname[MAX_BUF - 1] = 0; 164
179 for (i = strlen (tmpname); i > 0; i--) 165 for (i = strlen (tmpname); i > 0; i--)
180 { 166 {
181 tmpname[i] = 0; 167 tmpname[i] = 0;
182 at = find_archetype_by_object_name (tmpname); 168 at = find_archetype_by_object_name (tmpname);
169
183 if (at != NULL) 170 if (at)
184 {
185 return arch_to_object (at); 171 return arch_to_object (at);
186 }
187 } 172 }
173
188 return create_singularity (name); 174 return create_singularity (name);
189} 175}
190 176
191 /* This is a subset of the parse_id command. Basically, name can be 177 /* This is a subset of the parse_id command. Basically, name can be
192 * a string seperated lists of things to match, with certain keywords. 178 * a string seperated lists of things to match, with certain keywords.
… …
204 * If count is 1, make a quick check on the name. 190 * If count is 1, make a quick check on the name.
205 * IF count is >1, we need to make plural name. Return if match. 191 * IF count is >1, we need to make plural name. Return if match.
206 * Last, make a check on the full name. 192 * Last, make a check on the full name.
207 */ 193 */
208int 194int
209item_matched_string (object * pl, object * op, const char *name) 195item_matched_string (object *pl, object *op, const char *name)
210{ 196{
211 char *
212 cp,
213 local_name[MAX_BUF]; 197 char *cp, local_name[MAX_BUF];
214 int 198 int count, retval = 0;
215 count, 199
216 retval = 0;
217 strcpy (local_name, name); /* strtok is destructive to name */ 200 strcpy (local_name, name); /* strtok is destructive to name */
218 201
219 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 202 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
220 { 203 {
221 while (cp[0] == ' ') 204 while (cp[0] == ' ')
… …
272 retval = 15; 255 retval = 15;
273 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 256 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
274 retval = 14; 257 retval = 14;
275 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 258 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
276 retval = 14; 259 retval = 14;
277
278 /* Do substring checks, so things like 'Str+1' will match. 260 /* Do substring checks, so things like 'Str+1' will match.
279 * retval of these should perhaps be lower - they are lower 261 * retval of these should perhaps be lower - they are lower
280 * then the specific strcasecmp aboves, but still higher than 262 * then the specific strcasecmp aboves, but still higher than
281 * some other match criteria. 263 * some other match criteria.
282 */ 264 */
… …
284 retval = 12; 266 retval = 12;
285 else if (strstr (query_base_name (op, 0), cp)) 267 else if (strstr (query_base_name (op, 0), cp))
286 retval = 12; 268 retval = 12;
287 else if (strstr (query_short_name (op), cp)) 269 else if (strstr (query_short_name (op), cp))
288 retval = 12; 270 retval = 12;
289
290 /* Check against plural/non plural based on count. */ 271 /* Check against plural/non plural based on count. */
291 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 272 else if (count > 1 && !strcasecmp (cp, op->name_pl))
292 {
293 retval = 6; 273 retval = 6;
294 }
295 else if (count == 1 && !strcasecmp (op->name, cp)) 274 else if (count == 1 && !strcasecmp (op->name, cp))
296 {
297 retval = 6; 275 retval = 6;
298 }
299 /* base name matched - not bad */ 276 /* base name matched - not bad */
300 else if (strcasecmp (cp, op->name) == 0 && !count) 277 else if (strcasecmp (cp, op->name) == 0 && !count)
301 retval = 4; 278 retval = 4;
302 /* Check for partial custom name, but give a real low priority */ 279 /* Check for partial custom name, but give a real low priority */
303 else if (op->custom_name && strstr (op->custom_name, cp)) 280 else if (op->custom_name && strstr (op->custom_name, cp))
… …
305 282
306 if (retval) 283 if (retval)
307 { 284 {
308 if (pl->type == PLAYER) 285 if (pl->type == PLAYER)
309 pl->contr->count = count; 286 pl->contr->count = count;
287
310 return retval; 288 return retval;
311 } 289 }
312 } 290 }
291
313 return 0; 292 return 0;
314} 293}
315 294
316/* 295/*
317 * Initialises the internal linked list of archetypes (read from file). 296 * Initialises the internal linked list of archetypes (read from file).
… …
322void 301void
323init_archetypes (void) 302init_archetypes (void)
324{ /* called from add_player() and edit() */ 303{ /* called from add_player() and edit() */
325 if (first_archetype != NULL) /* Only do this once */ 304 if (first_archetype != NULL) /* Only do this once */
326 return; 305 return;
306
327 arch_init = 1; 307 arch_init = 1;
328 load_archetypes (); 308 load_archetypes ();
329 arch_init = 0; 309 arch_init = 0;
330 empty_archetype = find_archetype ("empty_archetype"); 310 empty_archetype = archetype::find ("empty_archetype");
311
331/* init_blocksview();*/ 312/* init_blocksview();*/
332} 313}
333 314
334/* 315/*
335 * Stores debug-information about how efficient the hashtable
336 * used for archetypes has been in the static errmsg array.
337 */
338
339void
340arch_info (object * op)
341{
342 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
343 new_draw_info (NDI_BLACK, 0, op, errmsg);
344}
345
346/*
347 * Initialise the hashtable used by the archetypes.
348 */
349
350void
351clear_archetable (void)
352{
353 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
354}
355
356/*
357 * An alternative way to init the hashtable which is slower, but _works_... 316 * An alternative way to init the hashtable which is slower, but _works_...
358 */ 317 */
359
360void 318void
361init_archetable (void) 319init_archetable (void)
362{ 320{
363 archetype *at; 321 archetype *at;
364 322
365 LOG (llevDebug, " Setting up archetable...\n"); 323 LOG (llevDebug, " Setting up archetable...\n");
366 324
367 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 325 for (at = first_archetype; at; at = at->more ? at->more : at->next)
368 add_arch (at); 326 at->hash_add ();
369 327
370 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
371} 329}
372 330
373/*
374 * Dumps an archetype to debug-level output.
375 */
376
377void
378dump_arch (archetype * at)
379{
380 dump_object (&at->clone);
381}
382
383/*
384 * Dumps _all_ archetypes to debug-level output.
385 * If you run crossfire with debug, and enter DM-mode, you can trigger
386 * this with the O key.
387 */
388
389void
390dump_all_archetypes (void)
391{
392 archetype *
393 at;
394 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
395 {
396 dump_arch (at);
397 fprintf (logfile, "%s\n", errmsg);
398 }
399}
400
401void 331void
402free_all_archs (void) 332free_all_archs (void)
403{ 333{
404 archetype * 334 archetype *at, *next;
405 at, *
406 next;
407 int
408 i = 0, f = 0; 335 int i = 0, f = 0;
409 336
410 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
411 { 338 {
412 if (at->more) 339 if (at->more)
413 next = at->more; 340 next = at->more;
414 else 341 else
415 next = at->next; 342 next = at->next;
416 343
417 delete 344 delete
418 at; 345 at;
346
419 i++; 347 i++;
420 } 348 }
349
421 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422} 351}
423 352
424/* 353archetype::archetype ()
425 * Allocates, initialises and returns the pointer to an archetype structure.
426 */
427// TODO: should become constructor
428archetype *
429get_archetype_struct (void)
430{ 354{
431 archetype *
432 arch;
433
434 arch = new archetype;
435
436 clear_object (&arch->clone); /* to initial state other also */
437 CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 355 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
438 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
357}
439 358
440 return arch; 359archetype::~archetype ()
360{
441} 361}
442 362
443/* 363/*
444 * Reads/parses the archetype-file, and copies into a linked list 364 * Reads/parses the archetype-file, and copies into a linked list
445 * of archetype-structures. 365 * of archetype-structures.
446 */ 366 */
447void 367void
448first_arch_pass (object_thawer & fp) 368first_arch_pass (object_thawer & fp)
449{ 369{
450 object * 370 archetype *head = 0, *last_more = 0;
451 op;
452 archetype *
453 at, *
454 head = NULL, *last_more = NULL;
455 int
456 i;
457 371
458 op = get_object (); 372 archetype *at = new archetype;
459 op->arch = first_archetype = at = get_archetype_struct (); 373 at->clone.arch = first_archetype = at;
460 374
461 while ((i = load_object (fp, op, 0))) 375 while (int i = load_object (fp, &at->clone, 0))
462 { 376 {
463 copy_object (op, &at->clone);
464 at->clone.speed_left = (float) (-0.1); 377 at->clone.speed_left = (float) (-0.1);
465 /* copy the body_info to the body_used - this is only really 378 /* copy the body_info to the body_used - this is only really
466 * need for monsters, but doesn't hurt to do it for everything. 379 * need for monsters, but doesn't hurt to do it for everything.
467 * by doing so, when a monster is created, it has good starting 380 * by doing so, when a monster is created, it has good starting
468 * values for the body_used info, so when items are created 381 * values for the body_used info, so when items are created
469 * for it, they can be properly equipped. 382 * for it, they can be properly equipped.
470 */ 383 */
471 memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info)); 384 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
472 385
473 switch (i) 386 switch (i)
474 { 387 {
475 case LL_NORMAL: /* A new archetype, just link it with the previous */ 388 case LL_NORMAL: /* A new archetype, just link it with the previous */
476 if (last_more != NULL) 389 if (last_more != NULL)
477 last_more->next = at; 390 last_more->next = at;
478 if (head != NULL) 391 if (head != NULL)
479 head->next = at; 392 head->next = at;
480 head = last_more = at; 393 head = last_more = at;
481#if 0 394#if 0
482 if (!op->type) 395 if (!op->type)
483 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name); 396 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
484#endif 397#endif
485 at->tail_x = 0; 398 at->tail_x = 0;
486 at->tail_y = 0; 399 at->tail_y = 0;
487 break; 400 break;
488 401
489 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 402 case LL_MORE: /* Another part of the previous archetype, link it correctly */
490 403
491 at->head = head; 404 at->head = head;
492 at->clone.head = &head->clone; 405 at->clone.head = &head->clone;
493 if (last_more != NULL) 406 if (last_more != NULL)
494 { 407 {
495 last_more->more = at; 408 last_more->more = at;
496 last_more->clone.more = &at->clone; 409 last_more->clone.more = &at->clone;
497 } 410 }
498 last_more = at; 411 last_more = at;
499 412
500 /* If this multipart image is still composed of individual small 413 /* If this multipart image is still composed of individual small
501 * images, don't set the tail_.. values. We can't use them anyways, 414 * images, don't set the tail_.. values. We can't use them anyways,
502 * and setting these to zero makes the map sending to the client much 415 * and setting these to zero makes the map sending to the client much
503 * easier as just looking at the head, we know what to do. 416 * easier as just looking at the head, we know what to do.
504 */ 417 */
505 if (at->clone.face != head->clone.face) 418 if (at->clone.face != head->clone.face)
506 { 419 {
507 head->tail_x = 0; 420 head->tail_x = 0;
508 head->tail_y = 0; 421 head->tail_y = 0;
509 } 422 }
510 else 423 else
511 { 424 {
512 if (at->clone.x > head->tail_x) 425 if (at->clone.x > head->tail_x)
513 head->tail_x = at->clone.x; 426 head->tail_x = at->clone.x;
514 if (at->clone.y > head->tail_y) 427 if (at->clone.y > head->tail_y)
515 head->tail_y = at->clone.y; 428 head->tail_y = at->clone.y;
516 } 429 }
517 break; 430 break;
518 431
519 } 432 }
520 433
521 at = get_archetype_struct (); 434 at = new archetype;
522 clear_object (op); 435
523 op->arch = at; 436 at->clone.arch = at;
524 } 437 }
525 438
526 delete 439 delete at;
527 at;
528 free_object (op);
529} 440}
530 441
531/* 442/*
532 * Reads the archetype file once more, and links all pointers between 443 * Reads the archetype file once more, and links all pointers between
533 * archetypes. 444 * archetypes.
534 */ 445 */
535 446
536void 447void
537second_arch_pass (object_thawer & thawer) 448second_arch_pass (object_thawer & thawer)
538{ 449{
539 char
540 buf[MAX_BUF], *
541 variable = buf, *argument, *cp; 450 char buf[MAX_BUF], *variable = buf, *argument, *cp;
542 archetype *
543 at = NULL, *other; 451 archetype *at = NULL, *other;
544 452
545 while (fgets (buf, MAX_BUF, thawer) != NULL) 453 while (fgets (buf, MAX_BUF, thawer) != NULL)
546 { 454 {
547 if (*buf == '#') 455 if (*buf == '#')
548 continue; 456 continue;
… …
556 cp--; 464 cp--;
557 } 465 }
558 } 466 }
559 if (!strcmp ("Object", variable)) 467 if (!strcmp ("Object", variable))
560 { 468 {
561 if ((at = find_archetype (argument)) == NULL) 469 if ((at = archetype::find (argument)) == NULL)
562 LOG (llevError, "Warning: failed to find arch %s\n", argument); 470 LOG (llevError, "Warning: failed to find arch %s\n", argument);
563 } 471 }
564 else if (!strcmp ("other_arch", variable)) 472 else if (!strcmp ("other_arch", variable))
565 { 473 {
566 if (at != NULL && at->clone.other_arch == NULL) 474 if (at != NULL && at->clone.other_arch == NULL)
567 { 475 {
568 if ((other = find_archetype (argument)) == NULL) 476 if ((other = archetype::find (argument)) == NULL)
569 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 477 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
570 else if (at != NULL) 478 else if (at != NULL)
571 at->clone.other_arch = other; 479 at->clone.other_arch = other;
572 } 480 }
573 } 481 }
574 else if (!strcmp ("randomitems", variable)) 482 else if (!strcmp ("randomitems", variable))
575 { 483 {
576 if (at != NULL) 484 if (at != NULL)
577 { 485 {
578 treasurelist *
579 tl = find_treasurelist (argument); 486 treasurelist *tl = find_treasurelist (argument);
487
580 if (tl == NULL) 488 if (tl == NULL)
581 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 489 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
582 else 490 else
583 at->clone.randomitems = tl; 491 at->clone.randomitems = tl;
584 } 492 }
… …
588 496
589#ifdef DEBUG 497#ifdef DEBUG
590void 498void
591check_generators (void) 499check_generators (void)
592{ 500{
593 archetype * 501 archetype *at;
594 at; 502
595 for (at = first_archetype; at != NULL; at = at->next) 503 for (at = first_archetype; at != NULL; at = at->next)
596 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 504 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
597 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); 505 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
598} 506}
599#endif 507#endif
… …
606 */ 514 */
607 515
608void 516void
609load_archetypes (void) 517load_archetypes (void)
610{ 518{
611 char
612 filename[MAX_BUF]; 519 char filename[MAX_BUF];
613 int
614 comp;
615#if TIME_ARCH_LOAD
616 struct timeval
617 tv1,
618 tv2;
619#endif
620 520
621 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
622 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
623 523
624 { 524 {
625 object_thawer 525 object_thawer
626 thawer (filename); 526 thawer (filename);
627 527
628 clear_archetable ();
629 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
630 first_arch_pass (thawer); 529 first_arch_pass (thawer);
631 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
632 } 531 }
633 532
… …
638 object_thawer 537 object_thawer
639 thawer (filename); 538 thawer (filename);
640 539
641 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
642 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
643 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
644 second_arch_pass (thawer); 544 second_arch_pass (thawer);
645 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
646#ifdef DEBUG 546#ifdef DEBUG
647 check_generators (); 547 check_generators ();
648#endif 548#endif
… …
652 552
653/* 553/*
654 * Creates and returns a new object which is a copy of the given archetype. 554 * Creates and returns a new object which is a copy of the given archetype.
655 * This function returns NULL on failure. 555 * This function returns NULL on failure.
656 */ 556 */
657
658object * 557object *
659arch_to_object (archetype * at) 558arch_to_object (archetype *at)
660{ 559{
661 object * 560 object *op;
662 op; 561
663 if (at == NULL) 562 if (at == NULL)
664 { 563 {
665 if (warn_archetypes) 564 if (warn_archetypes)
666 LOG (llevError, "Couldn't find archetype.\n"); 565 LOG (llevError, "Couldn't find archetype.\n");
566
667 return NULL; 567 return NULL;
668 } 568 }
669 op = get_object (); 569
670 copy_object (&at->clone, op); 570 op = at->clone.clone ();
571 op->arch = at;
671 op->instantiate (); 572 op->instantiate ();
672 op->arch = at;
673 return op; 573 return op;
674} 574}
675 575
676/* 576/*
677 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
678 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
679 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
680 * an object, and never NULL. 580 * an object, and never NULL.
681 */ 581 */
682
683object * 582object *
684create_singularity (const char *name) 583create_singularity (const char *name)
685{ 584{
686 object * 585 object *op;
687 op;
688 char
689 buf[MAX_BUF]; 586 char buf[MAX_BUF];
587
690 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
691 op = get_object (); 589 op = object::create ();
692 op->name = op->name_pl = buf; 590 op->name = op->name_pl = buf;
693 SET_FLAG (op, FLAG_NO_PICK); 591 SET_FLAG (op, FLAG_NO_PICK);
694 return op; 592 return op;
695} 593}
696 594
697/* 595/*
698 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
699 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
700 */ 598 */
701
702object * 599object *
703get_archetype (const char *name) 600get_archetype (const char *name)
704{ 601{
705 archetype * 602 archetype *at = archetype::find (name);
706 at; 603
707 at = find_archetype (name); 604 if (!at)
708 if (at == NULL)
709 return create_singularity (name); 605 return create_singularity (name);
606
710 return arch_to_object (at); 607 return arch_to_object (at);
711} 608}
712 609
713/* 610/*
714 * Hash-function used by the arch-hashtable. 611 * Hash-function used by the arch-hashtable.
715 */ 612 */
716 613
717unsigned long 614unsigned long
718hasharch (const char *str, int tablesize) 615hasharch (const char *str, int tablesize)
719{ 616{
720 unsigned long 617 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 618 unsigned int i = 0;
723 i = 0;
724 const char * 619 const char *p;
725 p;
726 620
727 /* use the one-at-a-time hash function, which supposedly is 621 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 622 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 623 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 624 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 639
746/* 640/*
747 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
749 */ 643 */
750
751archetype * 644archetype *
752find_archetype (const char *name) 645archetype::find (const char *name)
753{ 646{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 647 if (!name)
758 return 0; 648 return 0;
759 649
760 HT::const_iterator i = ht.find ((size_t)name); 650 AUTODECL (i, ht.find (name));
761 651
762 if (i == ht.end ()) 652 if (i == ht.end ())
763 return 0; 653 return 0;
764 else 654 else
765 return i->second; 655 return i->second;
766#endif
767
768 archetype *at;
769 unsigned long index;
770
771 if (name == NULL)
772 return (archetype *) NULL;
773
774 index = hasharch (name, ARCHTABLE);
775 arch_search++;
776 for (;;)
777 {
778 at = arch_table[index];
779 if (at == NULL)
780 {
781 if (warn_archetypes)
782 LOG (llevError, "Couldn't find archetype %s\n", name);
783 return NULL;
784 }
785 arch_cmp++;
786 if (!strcmp ((const char *) at->name, name))
787 return at;
788 if (++index >= ARCHTABLE)
789 index = 0;
790 }
791} 656}
792 657
793/* 658/*
794 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
795 */ 660 */
796 661void
797static void 662archetype::hash_add ()
798add_arch (archetype *at)
799{ 663{
800#if USE_UNORDERED_MAP 664 ht.insert (std::make_pair (name, this));
801 ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); 665}
802#endif
803 666
804 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 667void
805 668archetype::hash_del ()
806 for (;;) 669{
807 { 670 ht.erase (name);
808 if (arch_table[index] == NULL)
809 {
810 arch_table[index] = at;
811 return;
812 }
813
814 if (++index == ARCHTABLE)
815 index = 0;
816
817 if (index == org_index)
818 fatal (ARCHTABLE_TOO_SMALL);
819 }
820} 671}
821 672
822/* 673/*
823 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
824 * Used in treasure-generation. 675 * Used in treasure-generation.
825 */ 676 */
826
827archetype * 677archetype *
828type_to_archetype (int type) 678type_to_archetype (int type)
829{ 679{
830 archetype * 680 archetype *at;
831 at;
832 681
833 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 682 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
834 if (at->clone.type == type) 683 if (at->clone.type == type)
835 return at; 684 return at;
685
836 return NULL; 686 return 0;
837} 687}
838 688
839/* 689/*
840 * Returns a new object copied from the first archetype matching 690 * Returns a new object copied from the first archetype matching
841 * the given type. 691 * the given type.
… …
843 */ 693 */
844 694
845object * 695object *
846clone_arch (int type) 696clone_arch (int type)
847{ 697{
848 archetype * 698 archetype *at;
849 at;
850 object *
851 op = get_object ();
852 699
853 if ((at = type_to_archetype (type)) == NULL) 700 if ((at = type_to_archetype (type)) == NULL)
854 { 701 {
855 LOG (llevError, "Can't clone archetype %d\n", type); 702 LOG (llevError, "Can't clone archetype %d\n", type);
856 free_object (op);
857 return NULL; 703 return 0;
858 } 704 }
859 copy_object (&at->clone, op); 705
706 object *op = at->clone.clone ();
860 op->instantiate (); 707 op->instantiate ();
861 return op; 708 return op;
862} 709}
863 710
864/* 711/*
865 * member: make instance from class 712 * member: make instance from class
866 */ 713 */
867 714
868object * 715object *
869object_create_arch (archetype * at) 716object_create_arch (archetype *at)
870{ 717{
871 object * 718 object *op, *prev = 0, *head = 0;
872 op, *
873 prev = NULL, *head = NULL;
874 719
875 while (at) 720 while (at)
876 { 721 {
877 op = arch_to_object (at); 722 op = arch_to_object (at);
878 op->x = at->clone.x; 723 op->x = at->clone.x;
879 op->y = at->clone.y; 724 op->y = at->clone.y;
725
880 if (head) 726 if (head)
881 op->head = head, prev->more = op; 727 op->head = head, prev->more = op;
728
882 if (!head) 729 if (!head)
883 head = op; 730 head = op;
731
884 prev = op; 732 prev = op;
885 at = at->more; 733 at = at->more;
886 } 734 }
735
887 return (head); 736 return (head);
888} 737}
889 738
890/*** end of arch.c ***/

Diff Legend

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