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.17 by root, Tue Sep 12 19:20:06 2006 UTC vs.
Revision 1.50 by root, Mon Apr 16 13:02:28 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines