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.46 by root, Mon Apr 16 06:23:39 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
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 */
47 33
48/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
49 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
50 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
51 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
52 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
53 * MSW 2003-04-29 39 * MSW 2003-04-29
54 */ 40 */
55 41
56#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
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 55static std::vector<archetype *> archetypes;
62 56
63/** 57/**
64 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
65 * during the game (for example, "writing pen" instead of "stylus"). 59 * 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. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
72 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
73 */ 67 */
74archetype * 68archetype *
75find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
76{ 70{
77 archetype *at; 71 shstr_cmp name_cmp (name);
78 72
79 if (name == NULL)
80 return (archetype *) NULL;
81
82 for (at = first_archetype; at != NULL; at = at->next) 73 for (archetype *at = first_archetype; at; at = at->next)
83 { 74 if (at->clone.name == name_cmp)
84 if (!strcmp (at->clone.name, name))
85 return at; 75 return at;
86 } 76
87 return NULL; 77 return 0;
88} 78}
89 79
90/** 80/**
91 * This function retrieves an archetype by type and name that appears during 81 * This function retrieves an archetype by type and name that appears during
92 * the game. It is basically the same as find_archetype_by_object_name() 82 * the game. It is basically the same as find_archetype_by_object_name()
93 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
94 */ 84 */
95archetype * 85archetype *
96find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
97{ 87{
98 archetype *at; 88 shstr_cmp name_cmp (name);
99 89
100 if (name == NULL)
101 return NULL;
102
103 for (at = first_archetype; at != NULL; at = at->next) 90 for (archetype *at = first_archetype; at; at = at->next)
104 { 91 if (at->clone.name == name_cmp && at->clone.type == type)
105 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
106 return at; 92 return at;
107 }
108 93
109 return NULL; 94 return 0;
110} 95}
111 96
112/* This is a lot like the above function. Instead, we are trying to match 97/* This is a lot like the above function. Instead, we are trying to match
113 * the arch->skill values. type is the type of object to match 98 * the arch->skill values. type is the type of object to match
114 * against (eg, to only match against skills or only skill objects for example). 99 * against (eg, to only match against skills or only skill objects for example).
115 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
116 */ 101 */
117object * 102object *
118get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
119{ 104{
120 archetype * 105 shstr_cmp skill_cmp (skill);
121 at;
122 106
123 if (skill == NULL)
124 return NULL;
125
126 for (at = first_archetype; at != NULL; at = at->next) 107 for (archetype *at = first_archetype; at; at = at->next)
127 { 108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
128 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
129 return arch_to_object (at); 109 return arch_to_object (at);
130 } 110
131 return NULL; 111 return 0;
132} 112}
133 113
134/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
135 * that matches both the type and subtype. type and subtype 115 * 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 116 * can be -1 to say ignore, but in this case, the match it does
… …
139 * (eg, skills) 119 * (eg, skills)
140 */ 120 */
141archetype * 121archetype *
142get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
143{ 123{
144 archetype *
145 at;
146
147 for (at = first_archetype; at != NULL; at = at->next) 124 for (archetype *at = first_archetype; at; at = at->next)
148 {
149 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
150 return at; 126 return at;
151 } 127
152 return NULL; 128 return 0;
153} 129}
154 130
155/** 131/**
156 * GROS - this returns a new object given the name that appears during the game 132 * GROS - this returns a new object given the name that appears during the game
157 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
… …
165 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
166 */ 142 */
167object * 143object *
168get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
169{ 145{
170 archetype *
171 at;
172 char
173 tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
174 int 147 int i;
175 i;
176 148
177 strncpy (tmpname, name, MAX_BUF - 1); 149 assign (tmpname, name);
178 tmpname[MAX_BUF - 1] = 0; 150
179 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
180 { 152 {
181 tmpname[i] = 0; 153 tmpname[i] = 0;
154
182 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
183 if (at != NULL)
184 {
185 return arch_to_object (at); 156 return arch_to_object (at);
186 }
187 } 157 }
158
188 return create_singularity (name); 159 return create_singularity (name);
189} 160}
190 161
191 /* This is a subset of the parse_id command. Basically, name can be 162 /* 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. 163 * a string seperated lists of things to match, with certain keywords.
… …
204 * If count is 1, make a quick check on the name. 175 * 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. 176 * IF count is >1, we need to make plural name. Return if match.
206 * Last, make a check on the full name. 177 * Last, make a check on the full name.
207 */ 178 */
208int 179int
209item_matched_string (object * pl, object * op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *
212 cp,
213 local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
214 int 183 int count, retval = 0;
215 count, 184
216 retval = 0;
217 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
218 186
219 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
220 { 188 {
221 while (cp[0] == ' ') 189 while (cp[0] == ' ')
222 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
… …
272 retval = 15; 240 retval = 15;
273 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
274 retval = 14; 242 retval = 14;
275 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
276 retval = 14; 244 retval = 14;
277
278 /* Do substring checks, so things like 'Str+1' will match. 245 /* Do substring checks, so things like 'Str+1' will match.
279 * retval of these should perhaps be lower - they are lower 246 * retval of these should perhaps be lower - they are lower
280 * then the specific strcasecmp aboves, but still higher than 247 * then the specific strcasecmp aboves, but still higher than
281 * some other match criteria. 248 * some other match criteria.
282 */ 249 */
… …
284 retval = 12; 251 retval = 12;
285 else if (strstr (query_base_name (op, 0), cp)) 252 else if (strstr (query_base_name (op, 0), cp))
286 retval = 12; 253 retval = 12;
287 else if (strstr (query_short_name (op), cp)) 254 else if (strstr (query_short_name (op), cp))
288 retval = 12; 255 retval = 12;
289
290 /* Check against plural/non plural based on count. */ 256 /* Check against plural/non plural based on count. */
291 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 257 else if (count > 1 && !strcasecmp (cp, op->name_pl))
292 {
293 retval = 6; 258 retval = 6;
294 }
295 else if (count == 1 && !strcasecmp (op->name, cp)) 259 else if (count == 1 && !strcasecmp (op->name, cp))
296 {
297 retval = 6; 260 retval = 6;
298 }
299 /* base name matched - not bad */ 261 /* base name matched - not bad */
300 else if (strcasecmp (cp, op->name) == 0 && !count) 262 else if (strcasecmp (cp, op->name) == 0 && !count)
301 retval = 4; 263 retval = 4;
302 /* Check for partial custom name, but give a real low priority */ 264 /* Check for partial custom name, but give a real low priority */
303 else if (op->custom_name && strstr (op->custom_name, cp)) 265 else if (op->custom_name && strstr (op->custom_name, cp))
… …
305 267
306 if (retval) 268 if (retval)
307 { 269 {
308 if (pl->type == PLAYER) 270 if (pl->type == PLAYER)
309 pl->contr->count = count; 271 pl->contr->count = count;
272
310 return retval; 273 return retval;
311 } 274 }
312 } 275 }
276
313 return 0; 277 return 0;
314} 278}
315
316/*
317 * Initialises the internal linked list of archetypes (read from file).
318 * Then the global "empty_archetype" pointer is initialised.
319 * Then the blocksview[] array is initialised.
320 */
321 279
322void 280void
323init_archetypes (void) 281init_archetypes (void)
324{ /* called from add_player() and edit() */ 282{
325 if (first_archetype != NULL) /* Only do this once */
326 return;
327 arch_init = 1;
328 load_archetypes (); 283 load_archetypes ();
329 arch_init = 0; 284
330 empty_archetype = find_archetype ("empty_archetype"); 285 empty_archetype = archetype::find ("empty_archetype");
331/* init_blocksview();*/
332} 286}
333 287
334/* 288archetype::archetype ()
335 * Stores debug-information about how efficient the hashtable 289{
336 * used for archetypes has been in the static errmsg array. 290 clone.arch = this;
337 */
338 291
292 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
293 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
294}
295
296archetype::~archetype ()
297{
298 //TODO: nuke ->more's
299}
300
301static void
302unlink (archetype *at)
303{
304 if (at->head)
305 at = at->head;
306
307 // destroy this archetype's link, making singletons out of its parts
308 while (at)
309 {
310 archetype *more = at->more;
311 at->clone.destroy_inv ();
312 at->head = at->more = 0;
313 at = more;
314 }
315}
316
317// dire hack, need to rationalise
339void 318void
340arch_info (object * op) 319overwrite (archetype *at, object *op)
341{ 320{
342 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 321 at->clone = *op;
343 new_draw_info (NDI_BLACK, 0, op, errmsg); 322
323 at->clone.arch = at;
324 //TODO: inv et al.
344} 325}
345 326
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_...
358 */
359
360void
361init_archetable (void)
362{
363 archetype *at;
364
365 LOG (llevDebug, " Setting up archetable...\n");
366
367 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
368 add_arch (at);
369
370 LOG (llevDebug, "done\n");
371}
372
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
402free_all_archs (void)
403{
404 archetype *
405 at, *
406 next;
407 int
408 i = 0, f = 0;
409
410 for (at = first_archetype; at != NULL; at = next)
411 {
412 if (at->more)
413 next = at->more;
414 else
415 next = at->next;
416
417 delete
418 at;
419 i++;
420 }
421 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422}
423
424/*
425 * Allocates, initialises and returns the pointer to an archetype structure.
426 */
427// TODO: should become constructor
428archetype * 327archetype *
429get_archetype_struct (void) 328archetype::read (object_thawer &f)
430{ 329{
431 archetype * 330 assert (f.kw == KW_object);
432 arch;
433 331
434 arch = new archetype; 332 archetype *head = get (f.get_str ());
333 unlink (head);
334 object *op = object::create ();
435 335
436 clear_object (&arch->clone); /* to initial state other also */ 336 if (!op->parse_kv (f))
437 CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 337 {
438 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */ 338 op->destroy (true);
339 // leak head
340 return 0;
341 }
439 342
343 overwrite (head, op);
344 op->destroy ();
345
346 for (archetype *prev = head; f.kw == KW_more; )
347 {
348 f.next ();
349 assert (f.kw == KW_object);
350
351 archetype *more = get (f.get_str ());
352 unlink (more);
353 object *op = object::create ();
354
355 if (!op->parse_kv (f))
356 {
357 op->destroy (true);
358 // leak head more*
359 return 0;
360 }
361
362 overwrite (more, op);
363 op->destroy ();
364
365 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
366 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
367
368 more->head = head;
369 more->clone.head = &head->clone;
370 prev->more = more;
371 prev->clone.more = &more->clone;
372
373 prev = more;
374 }
375
376 if (!head->next)
377 {
378 head->next = first_archetype;
379 first_archetype = head;
380 }
381
440 return arch; 382 return head;
441} 383}
442 384
443/* 385/*
444 * Reads/parses the archetype-file, and copies into a linked list 386 * Reads/parses the archetype-file, and copies into a linked list
445 * of archetype-structures. 387 * of archetype-structures.
446 */ 388 */
447void 389static bool
448first_arch_pass (object_thawer & fp) 390load_archetypes (object_thawer &f)
449{ 391{
450 object * 392 for (;;)
451 op;
452 archetype *
453 at, *
454 head = NULL, *last_more = NULL;
455 int
456 i;
457
458 op = get_object ();
459 op->arch = first_archetype = at = get_archetype_struct ();
460
461 while ((i = load_object (fp, op, 0)))
462 { 393 {
463 copy_object (op, &at->clone);
464 at->clone.speed_left = (float) (-0.1);
465 /* 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.
467 * by doing so, when a monster is created, it has good starting
468 * values for the body_used info, so when items are created
469 * for it, they can be properly equipped.
470 */
471 memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info));
472
473 switch (i) 394 switch (f.kw)
474 { 395 {
475 case LL_NORMAL: /* A new archetype, just link it with the previous */ 396 case KW_object:
476 if (last_more != NULL) 397 loading_arch = true;
477 last_more->next = at; 398 if (!archetype::read (f))
478 if (head != NULL)
479 head->next = at;
480 head = last_more = at;
481#if 0
482 if (!op->type)
483 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
484#endif
485 at->tail_x = 0;
486 at->tail_y = 0;
487 break;
488
489 case LL_MORE: /* Another part of the previous archetype, link it correctly */
490
491 at->head = head;
492 at->clone.head = &head->clone;
493 if (last_more != NULL)
494 { 399 {
495 last_more->more = at; 400 loading_arch = false;
496 last_more->clone.more = &at->clone; 401 return false;
497 } 402 }
498 last_more = at;
499 403
500 /* If this multipart image is still composed of individual small 404 loading_arch = false;
501 * images, don't set the tail_.. values. We can't use them anyways, 405 continue;
502 * and setting these to zero makes the map sending to the client much 406
503 * easier as just looking at the head, we know what to do. 407 case KW_EOF:
504 */ 408 return true;
505 if (at->clone.face != head->clone.face) 409
506 {
507 head->tail_x = 0;
508 head->tail_y = 0;
509 }
510 else 410 default:
511 { 411 if (!f.parse_error ("archetypes file"))
512 if (at->clone.x > head->tail_x) 412 return false;
513 head->tail_x = at->clone.x;
514 if (at->clone.y > head->tail_y)
515 head->tail_y = at->clone.y;
516 }
517 break;
518
519 } 413 }
520 414
521 at = get_archetype_struct (); 415 f.next ();
522 clear_object (op);
523 op->arch = at;
524 }
525
526 delete
527 at;
528 free_object (op);
529}
530
531/*
532 * Reads the archetype file once more, and links all pointers between
533 * archetypes.
534 */
535
536void
537second_arch_pass (object_thawer & thawer)
538{
539 char
540 buf[MAX_BUF], *
541 variable = buf, *argument, *cp;
542 archetype *
543 at = NULL, *other;
544
545 while (fgets (buf, MAX_BUF, thawer) != NULL)
546 { 416 }
547 if (*buf == '#')
548 continue;
549 if ((argument = strchr (buf, ' ')) != NULL)
550 {
551 *argument = '\0', argument++;
552 cp = argument + strlen (argument) - 1;
553 while (isspace (*cp))
554 {
555 *cp = '\0';
556 cp--;
557 }
558 }
559 if (!strcmp ("Object", variable))
560 {
561 if ((at = find_archetype (argument)) == NULL)
562 LOG (llevError, "Warning: failed to find arch %s\n", argument);
563 }
564 else if (!strcmp ("other_arch", variable))
565 {
566 if (at != NULL && at->clone.other_arch == NULL)
567 {
568 if ((other = find_archetype (argument)) == NULL)
569 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
570 else if (at != NULL)
571 at->clone.other_arch = other;
572 }
573 }
574 else if (!strcmp ("randomitems", variable))
575 {
576 if (at != NULL)
577 {
578 treasurelist *
579 tl = find_treasurelist (argument);
580 if (tl == NULL)
581 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
582 else
583 at->clone.randomitems = tl;
584 }
585 }
586 }
587} 417}
588
589#ifdef DEBUG
590void
591check_generators (void)
592{
593 archetype *
594 at;
595 for (at = first_archetype; at != NULL; at = at->next)
596 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);
598}
599#endif
600 418
601/* 419/*
602 * First initialises the archtype hash-table (init_archetable()). 420 * First initialises the archtype hash-table (init_archetable()).
603 * Reads and parses the archetype file (with the first and second-pass 421 * Reads and parses the archetype file (with the first and second-pass
604 * functions). 422 * functions).
605 * Then initialises treasures by calling load_treasures(). 423 * Then initialises treasures by calling load_treasures().
606 */ 424 */
607
608void 425void
609load_archetypes (void) 426load_archetypes (void)
610{ 427{
611 char
612 filename[MAX_BUF]; 428 char filename[MAX_BUF];
613 int
614 comp;
615#if TIME_ARCH_LOAD
616 struct timeval
617 tv1,
618 tv2;
619#endif
620 429
621 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 430 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
622 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 431 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
623 432
624 {
625 object_thawer
626 thawer (filename); 433 object_thawer f (filename);
627 434
628 clear_archetable (); 435 f.next ();
629 LOG (llevDebug, " arch-pass 1...\n");
630 first_arch_pass (thawer);
631 LOG (llevDebug, " done\n");
632 }
633 436
634 init_archetable (); 437 if (!load_archetypes (f))
438 cleanup ("unable to load archetypes");
439
635 warn_archetypes = 1; 440 warn_archetypes = 1;
636
637 {
638 object_thawer
639 thawer (filename);
640
641 LOG (llevDebug, " loading treasure...\n");
642 load_treasures ();
643 LOG (llevDebug, " done\n arch-pass 2...\n");
644 second_arch_pass (thawer);
645 LOG (llevDebug, " done\n");
646#ifdef DEBUG
647 check_generators ();
648#endif
649 }
650 LOG (llevDebug, " done\n");
651} 441}
652 442
653/* 443/*
654 * Creates and returns a new object which is a copy of the given archetype. 444 * Creates and returns a new object which is a copy of the given archetype.
655 * This function returns NULL on failure. 445 * This function returns NULL on failure.
656 */ 446 */
657
658object * 447object *
659arch_to_object (archetype * at) 448arch_to_object (archetype *at)
660{ 449{
661 object * 450 if (!at)
662 op;
663 if (at == NULL)
664 { 451 {
665 if (warn_archetypes) 452 if (warn_archetypes)
666 LOG (llevError, "Couldn't find archetype.\n"); 453 LOG (llevError, "Couldn't find archetype.\n");
454
667 return NULL; 455 return NULL;
668 } 456 }
669 op = get_object (); 457
670 copy_object (&at->clone, op); 458 object *op = at->clone.clone ();
459 op->arch = at;
671 op->instantiate (); 460 op->instantiate ();
672 op->arch = at;
673 return op; 461 return op;
674} 462}
675 463
676/* 464/*
677 * Creates an object. This function is called by get_archetype() 465 * Creates an object. This function is called by get_archetype()
678 * if it fails to find the appropriate archetype. 466 * if it fails to find the appropriate archetype.
679 * Thus get_archetype() will be guaranteed to always return 467 * Thus get_archetype() will be guaranteed to always return
680 * an object, and never NULL. 468 * an object, and never NULL.
681 */ 469 */
682
683object * 470object *
684create_singularity (const char *name) 471create_singularity (const char *name)
685{ 472{
686 object * 473 object *op;
687 op;
688 char
689 buf[MAX_BUF]; 474 char buf[MAX_BUF];
475
690 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 476 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
691 op = get_object (); 477 op = object::create ();
692 op->name = op->name_pl = buf; 478 op->name = op->name_pl = buf;
693 SET_FLAG (op, FLAG_NO_PICK); 479 SET_FLAG (op, FLAG_NO_PICK);
694 return op; 480 return op;
695} 481}
696 482
697/* 483/*
698 * Finds which archetype matches the given name, and returns a new 484 * Finds which archetype matches the given name, and returns a new
699 * object containing a copy of the archetype. 485 * object containing a copy of the archetype.
700 */ 486 */
701
702object * 487object *
703get_archetype (const char *name) 488get_archetype (const char *name)
704{ 489{
705 archetype * 490 archetype *at = archetype::find (name);
706 at; 491
707 at = find_archetype (name); 492 if (!at)
708 if (at == NULL)
709 return create_singularity (name); 493 return create_singularity (name);
494
710 return arch_to_object (at); 495 return arch_to_object (at);
711} 496}
712 497
713/* 498/*
714 * Hash-function used by the arch-hashtable. 499 * Hash-function used by the arch-hashtable.
715 */ 500 */
716 501
717unsigned long 502unsigned long
718hasharch (const char *str, int tablesize) 503hasharch (const char *str, int tablesize)
719{ 504{
720 unsigned long 505 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 506 unsigned int i = 0;
723 i = 0;
724 const char * 507 const char *p;
725 p;
726 508
727 /* use the one-at-a-time hash function, which supposedly is 509 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 510 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 511 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 512 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 527
746/* 528/*
747 * Finds, using the hashtable, which archetype matches the given name. 529 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 530 * returns a pointer to the found archetype, otherwise NULL.
749 */ 531 */
750
751archetype * 532archetype *
752find_archetype (const char *name) 533archetype::find (const char *name)
753{ 534{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 535 if (!name)
758 return 0; 536 return 0;
759 537
760 HT::const_iterator i = ht.find ((size_t)name); 538 AUTODECL (i, ht.find (name));
761 539
762 if (i == ht.end ()) 540 if (i == ht.end ())
763 return 0; 541 return 0;
764 else 542 else
765 return i->second; 543 return i->second;
766#endif 544}
767 545
768 archetype *at; 546archetype *
769 unsigned long index; 547archetype::get (const char *name)
548{
549 archetype *at = find (name);
770 550
771 if (name == NULL) 551 if (!at)
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 } 552 {
553 archetypes.push_back (at = new archetype);
554 at->name = name;
555 at->hash_add ();
556 }
557
558 return at;
791} 559}
792 560
793/* 561/*
794 * Adds an archetype to the hashtable. 562 * Adds an archetype to the hashtable.
795 */ 563 */
796 564void
797static void 565archetype::hash_add ()
798add_arch (archetype *at)
799{ 566{
800#if USE_UNORDERED_MAP 567 ht.insert (std::make_pair (name, this));
801 ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); 568}
802#endif
803 569
804 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 570void
805 571archetype::hash_del ()
806 for (;;) 572{
807 { 573 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} 574}
821 575
822/* 576/*
823 * Returns the first archetype using the given type. 577 * Returns the first archetype using the given type.
824 * Used in treasure-generation. 578 * Used in treasure-generation.
825 */ 579 */
826
827archetype * 580archetype *
828type_to_archetype (int type) 581type_to_archetype (int type)
829{ 582{
830 archetype *
831 at;
832
833 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 583 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
834 if (at->clone.type == type) 584 if (at->clone.type == type)
835 return at; 585 return at;
586
836 return NULL; 587 return 0;
837} 588}
838 589
839/* 590/*
840 * Returns a new object copied from the first archetype matching 591 * Returns a new object copied from the first archetype matching
841 * the given type. 592 * the given type.
842 * Used in treasure-generation. 593 * Used in treasure-generation.
843 */ 594 */
844
845object * 595object *
846clone_arch (int type) 596clone_arch (int type)
847{ 597{
848 archetype * 598 archetype *at;
849 at;
850 object *
851 op = get_object ();
852 599
853 if ((at = type_to_archetype (type)) == NULL) 600 if ((at = type_to_archetype (type)) == NULL)
854 { 601 {
855 LOG (llevError, "Can't clone archetype %d\n", type); 602 LOG (llevError, "Can't clone archetype %d\n", type);
856 free_object (op);
857 return NULL; 603 return 0;
858 } 604 }
859 copy_object (&at->clone, op); 605
606 object *op = at->clone.clone ();
860 op->instantiate (); 607 op->instantiate ();
861 return op; 608 return op;
862} 609}
863 610
864/* 611/*
865 * member: make instance from class 612 * member: make instance from class
866 */ 613 */
867 614
868object * 615object *
869object_create_arch (archetype * at) 616object_create_arch (archetype *at)
870{ 617{
871 object * 618 object *op, *prev = 0, *head = 0;
872 op, *
873 prev = NULL, *head = NULL;
874 619
875 while (at) 620 while (at)
876 { 621 {
877 op = arch_to_object (at); 622 op = arch_to_object (at);
878 op->x = at->clone.x; 623 op->x = at->clone.x;
879 op->y = at->clone.y; 624 op->y = at->clone.y;
625
880 if (head) 626 if (head)
881 op->head = head, prev->more = op; 627 op->head = head, prev->more = op;
628
882 if (!head) 629 if (!head)
883 head = op; 630 head = op;
631
884 prev = op; 632 prev = op;
885 at = at->more; 633 at = at->more;
886 } 634 }
635
887 return (head); 636 return (head);
888} 637}
889 638
890/*** end of arch.c ***/

Diff Legend

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