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.15 by root, Sun Sep 10 13:20:12 2006 UTC vs.
Revision 1.58 by root, Sat Apr 21 11:55:36 2007 UTC

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

Diff Legend

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