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.14 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.43 by root, Fri Feb 16 19:43:40 2007 UTC

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

Diff Legend

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