ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.12 by root, Mon Sep 4 17:16:19 2006 UTC vs.
Revision 1.42 by root, Fri Feb 9 01:52:10 2007 UTC

1/* 1/*
2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.12 2006/09/04 17:16:19 root Exp $";
4 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
8 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 23 */
28 24
29#include <cassert> 25#include <cassert>
30 26
31#include <tr1/unordered_map>
32
33#include <global.h> 27#include <global.h>
34#include <arch.h>
35#include <funcpoint.h> 28#include <funcpoint.h>
36#include <loader.h> 29#include <loader.h>
37 30
38/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
39#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
40 33
41static void add_arch (archetype * at);
42
43static archetype *arch_table[ARCHTABLE];
44int arch_cmp = 0; /* How many strcmp's */
45int arch_search = 0; /* How many searches */
46int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
47 35
48/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
49 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
50 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
51 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
52 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
53 * MSW 2003-04-29 41 * MSW 2003-04-29
54 */ 42 */
55 43
56#if USE_UNORDERED_MAP
57// the hashtable 44// the hashtable
58typedef std::tr1::unordered_map<size_t, archetype *> HT; 45typedef std::tr1::unordered_map
46 <
47 const char *,
48 arch_ptr,
49 str_hash,
50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT;
59 53
60static HT ht; 54static HT ht (5000);
61#endif
62 55
63/** 56/**
64 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
65 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
66 * It does not use the hashtable system, but browse the whole archlist each time. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
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; 305 archetype *at;
364 306
365 LOG (llevDebug, " Setting up archetable...\n"); 307 LOG (llevDebug, " Setting up archetable...\n");
366 308
367 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 309 for (at = first_archetype; at; at = at->more ? at->more : at->next)
368 add_arch (at); 310 at->hash_add ();
369 311
370 LOG (llevDebug, "done\n"); 312 LOG (llevDebug, "done\n");
371} 313}
372 314
373/*
374 * Dumps an archetype to debug-level output.
375 */
376
377void
378dump_arch (archetype * at)
379{
380 dump_object (&at->clone);
381}
382
383/*
384 * Dumps _all_ archetypes to debug-level output.
385 * If you run crossfire with debug, and enter DM-mode, you can trigger
386 * this with the O key.
387 */
388
389void
390dump_all_archetypes (void)
391{
392 archetype *
393 at;
394 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
395 {
396 dump_arch (at);
397 fprintf (logfile, "%s\n", errmsg);
398 }
399}
400
401void 315void
402free_all_archs (void) 316free_all_archs (void)
403{ 317{
404 archetype * 318 archetype *at, *next;
405 at, *
406 next;
407 int
408 i = 0, f = 0; 319 int i = 0, f = 0;
409 320
410 for (at = first_archetype; at != NULL; at = next) 321 for (at = first_archetype; at; at = next)
411 { 322 {
412 if (at->more) 323 if (at->more)
413 next = at->more; 324 next = at->more;
414 else 325 else
415 next = at->next; 326 next = at->next;
416 327
417 delete 328 delete
418 at; 329 at;
330
419 i++; 331 i++;
420 } 332 }
333
421 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 334 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422} 335}
423 336
424/* 337archetype::archetype ()
425 * Allocates, initialises and returns the pointer to an archetype structure.
426 */
427// TODO: should become constructor
428archetype *
429get_archetype_struct (void)
430{ 338{
431 archetype *
432 arch;
433
434 arch = new archetype;
435
436 clear_object (&arch->clone); /* to initial state other also */
437 CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 339 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
438 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */ 340 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
341}
439 342
440 return arch; 343archetype::~archetype ()
344{
441} 345}
442 346
443/* 347/*
444 * Reads/parses the archetype-file, and copies into a linked list 348 * Reads/parses the archetype-file, and copies into a linked list
445 * of archetype-structures. 349 * of archetype-structures.
446 */ 350 */
447void 351void
448first_arch_pass (object_thawer & fp) 352first_arch_pass (object_thawer & fp)
449{ 353{
450 object * 354 archetype *head = 0, *last_more = 0;
451 op;
452 archetype *
453 at, *
454 head = NULL, *last_more = NULL;
455 int
456 i;
457 355
458 op = get_object (); 356 archetype *at = new archetype;
459 op->arch = first_archetype = at = get_archetype_struct (); 357 at->clone.arch = first_archetype = at;
460 358
461 while ((i = load_object (fp, op, 0))) 359 while (int i = load_object (fp, &at->clone, 0))
462 { 360 {
463 copy_object (op, &at->clone);
464 at->clone.speed_left = (float) (-0.1); 361 at->clone.speed_left = (float) (-0.1);
465 /* copy the body_info to the body_used - this is only really 362 /* copy the body_info to the body_used - this is only really
466 * need for monsters, but doesn't hurt to do it for everything. 363 * need for monsters, but doesn't hurt to do it for everything.
467 * by doing so, when a monster is created, it has good starting 364 * by doing so, when a monster is created, it has good starting
468 * values for the body_used info, so when items are created 365 * values for the body_used info, so when items are created
469 * for it, they can be properly equipped. 366 * for it, they can be properly equipped.
470 */ 367 */
471 memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info)); 368 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
472 369
473 switch (i) 370 switch (i)
474 { 371 {
475 case LL_NORMAL: /* A new archetype, just link it with the previous */ 372 case LL_NORMAL: /* A new archetype, just link it with the previous */
476 if (last_more != NULL) 373 if (last_more != NULL)
477 last_more->next = at; 374 last_more->next = at;
478 if (head != NULL) 375 if (head != NULL)
479 head->next = at; 376 head->next = at;
480 head = last_more = at; 377 head = last_more = at;
481#if 0 378#if 0
482 if (!op->type) 379 if (!op->type)
483 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name); 380 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
484#endif 381#endif
485 at->tail_x = 0; 382 at->tail_x = 0;
486 at->tail_y = 0; 383 at->tail_y = 0;
487 break; 384 break;
488 385
489 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 386 case LL_MORE: /* Another part of the previous archetype, link it correctly */
490 387
491 at->head = head; 388 at->head = head;
492 at->clone.head = &head->clone; 389 at->clone.head = &head->clone;
493 if (last_more != NULL) 390 if (last_more != NULL)
494 { 391 {
495 last_more->more = at; 392 last_more->more = at;
496 last_more->clone.more = &at->clone; 393 last_more->clone.more = &at->clone;
497 } 394 }
498 last_more = at; 395 last_more = at;
499 396
500 /* If this multipart image is still composed of individual small 397 /* If this multipart image is still composed of individual small
501 * images, don't set the tail_.. values. We can't use them anyways, 398 * images, don't set the tail_.. values. We can't use them anyways,
502 * and setting these to zero makes the map sending to the client much 399 * and setting these to zero makes the map sending to the client much
503 * easier as just looking at the head, we know what to do. 400 * easier as just looking at the head, we know what to do.
504 */ 401 */
505 if (at->clone.face != head->clone.face) 402 if (at->clone.face != head->clone.face)
506 { 403 {
507 head->tail_x = 0; 404 head->tail_x = 0;
508 head->tail_y = 0; 405 head->tail_y = 0;
509 } 406 }
510 else 407 else
511 { 408 {
512 if (at->clone.x > head->tail_x) 409 if (at->clone.x > head->tail_x)
513 head->tail_x = at->clone.x; 410 head->tail_x = at->clone.x;
514 if (at->clone.y > head->tail_y) 411 if (at->clone.y > head->tail_y)
515 head->tail_y = at->clone.y; 412 head->tail_y = at->clone.y;
516 } 413 }
517 break; 414 break;
518 415
519 } 416 }
520 417
521 at = get_archetype_struct (); 418 at = new archetype;
522 clear_object (op); 419
523 op->arch = at; 420 at->clone.arch = at;
524 } 421 }
525 422
526 delete 423 delete at;
527 at;
528 free_object (op);
529} 424}
530 425
531/* 426/*
532 * Reads the archetype file once more, and links all pointers between 427 * Reads the archetype file once more, and links all pointers between
533 * archetypes. 428 * archetypes.
534 */ 429 */
535 430
536void 431void
537second_arch_pass (object_thawer & thawer) 432second_arch_pass (object_thawer & thawer)
538{ 433{
539 char
540 buf[MAX_BUF], *
541 variable = buf, *argument, *cp; 434 char buf[MAX_BUF], *variable = buf, *argument, *cp;
542 archetype *
543 at = NULL, *other; 435 archetype *at = NULL, *other;
544 436
545 while (fgets (buf, MAX_BUF, thawer) != NULL) 437 while (fgets (buf, MAX_BUF, thawer) != NULL)
546 { 438 {
547 if (*buf == '#') 439 if (*buf == '#')
548 continue; 440 continue;
441
549 if ((argument = strchr (buf, ' ')) != NULL) 442 if ((argument = strchr (buf, ' ')) != NULL)
550 { 443 {
551 *argument = '\0', argument++; 444 *argument = '\0', argument++;
552 cp = argument + strlen (argument) - 1; 445 cp = argument + strlen (argument) - 1;
553 while (isspace (*cp)) 446 while (isspace (*cp))
554 { 447 {
555 *cp = '\0'; 448 *cp = '\0';
556 cp--; 449 cp--;
557 } 450 }
558 } 451 }
452
559 if (!strcmp ("Object", variable)) 453 if (!strcmp ("object", variable))
560 { 454 {
561 if ((at = find_archetype (argument)) == NULL) 455 if ((at = archetype::find (argument)) == NULL)
562 LOG (llevError, "Warning: failed to find arch %s\n", argument); 456 LOG (llevError, "Warning: failed to find arch %s\n", argument);
563 } 457 }
564 else if (!strcmp ("other_arch", variable)) 458 else if (!strcmp ("other_arch", variable))
565 { 459 {
566 if (at != NULL && at->clone.other_arch == NULL) 460 if (at != NULL && at->clone.other_arch == NULL)
567 { 461 {
568 if ((other = find_archetype (argument)) == NULL) 462 if ((other = archetype::find (argument)) == NULL)
569 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 463 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
570 else if (at != NULL) 464 else if (at != NULL)
571 at->clone.other_arch = other; 465 at->clone.other_arch = other;
572 } 466 }
573 } 467 }
574 else if (!strcmp ("randomitems", variable)) 468 else if (!strcmp ("randomitems", variable))
575 { 469 {
576 if (at != NULL) 470 if (at)
577 { 471 {
578 treasurelist *
579 tl = find_treasurelist (argument); 472 treasurelist *tl = find_treasurelist (argument);
473
580 if (tl == NULL) 474 if (tl == NULL)
581 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 475 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
582 else 476 else
583 at->clone.randomitems = tl; 477 at->clone.randomitems = tl;
584 } 478 }
… …
588 482
589#ifdef DEBUG 483#ifdef DEBUG
590void 484void
591check_generators (void) 485check_generators (void)
592{ 486{
593 archetype * 487 archetype *at;
594 at; 488
595 for (at = first_archetype; at != NULL; at = at->next) 489 for (at = first_archetype; at != NULL; at = at->next)
596 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 490 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
597 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); 491 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
598} 492}
599#endif 493#endif
… …
606 */ 500 */
607 501
608void 502void
609load_archetypes (void) 503load_archetypes (void)
610{ 504{
611 char
612 filename[MAX_BUF]; 505 char filename[MAX_BUF];
613 int
614 comp;
615#if TIME_ARCH_LOAD
616 struct timeval
617 tv1,
618 tv2;
619#endif
620 506
621 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 507 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
622 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 508 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
623 509
624 { 510 {
625 object_thawer 511 object_thawer
626 thawer (filename); 512 thawer (filename);
627 513
628 clear_archetable ();
629 LOG (llevDebug, " arch-pass 1...\n"); 514 LOG (llevDebug, " arch-pass 1...\n");
630 first_arch_pass (thawer); 515 first_arch_pass (thawer);
631 LOG (llevDebug, " done\n"); 516 LOG (llevDebug, " done\n");
632 } 517 }
633 518
… …
638 object_thawer 523 object_thawer
639 thawer (filename); 524 thawer (filename);
640 525
641 LOG (llevDebug, " loading treasure...\n"); 526 LOG (llevDebug, " loading treasure...\n");
642 load_treasures (); 527 load_treasures ();
528 LOG (llevDebug, " done\n");
643 LOG (llevDebug, " done\n arch-pass 2...\n"); 529 LOG (llevDebug, " arch-pass 2...\n");
644 second_arch_pass (thawer); 530 second_arch_pass (thawer);
645 LOG (llevDebug, " done\n"); 531 LOG (llevDebug, " done\n");
646#ifdef DEBUG 532#ifdef DEBUG
647 check_generators (); 533 check_generators ();
648#endif 534#endif
… …
652 538
653/* 539/*
654 * Creates and returns a new object which is a copy of the given archetype. 540 * Creates and returns a new object which is a copy of the given archetype.
655 * This function returns NULL on failure. 541 * This function returns NULL on failure.
656 */ 542 */
657
658object * 543object *
659arch_to_object (archetype * at) 544arch_to_object (archetype *at)
660{ 545{
661 object * 546 object *op;
662 op; 547
663 if (at == NULL) 548 if (at == NULL)
664 { 549 {
665 if (warn_archetypes) 550 if (warn_archetypes)
666 LOG (llevError, "Couldn't find archetype.\n"); 551 LOG (llevError, "Couldn't find archetype.\n");
552
667 return NULL; 553 return NULL;
668 } 554 }
669 op = get_object (); 555
670 copy_object (&at->clone, op); 556 op = at->clone.clone ();
557 op->arch = at;
671 op->instantiate (); 558 op->instantiate ();
672 op->arch = at;
673 return op; 559 return op;
674} 560}
675 561
676/* 562/*
677 * Creates an object. This function is called by get_archetype() 563 * Creates an object. This function is called by get_archetype()
678 * if it fails to find the appropriate archetype. 564 * if it fails to find the appropriate archetype.
679 * Thus get_archetype() will be guaranteed to always return 565 * Thus get_archetype() will be guaranteed to always return
680 * an object, and never NULL. 566 * an object, and never NULL.
681 */ 567 */
682
683object * 568object *
684create_singularity (const char *name) 569create_singularity (const char *name)
685{ 570{
686 object * 571 object *op;
687 op;
688 char
689 buf[MAX_BUF]; 572 char buf[MAX_BUF];
573
690 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 574 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
691 op = get_object (); 575 op = object::create ();
692 op->name = op->name_pl = buf; 576 op->name = op->name_pl = buf;
693 SET_FLAG (op, FLAG_NO_PICK); 577 SET_FLAG (op, FLAG_NO_PICK);
694 return op; 578 return op;
695} 579}
696 580
697/* 581/*
698 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
699 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
700 */ 584 */
701
702object * 585object *
703get_archetype (const char *name) 586get_archetype (const char *name)
704{ 587{
705 archetype * 588 archetype *at = archetype::find (name);
706 at; 589
707 at = find_archetype (name); 590 if (!at)
708 if (at == NULL)
709 return create_singularity (name); 591 return create_singularity (name);
592
710 return arch_to_object (at); 593 return arch_to_object (at);
711} 594}
712 595
713/* 596/*
714 * Hash-function used by the arch-hashtable. 597 * Hash-function used by the arch-hashtable.
715 */ 598 */
716 599
717unsigned long 600unsigned long
718hasharch (const char *str, int tablesize) 601hasharch (const char *str, int tablesize)
719{ 602{
720 unsigned long 603 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 604 unsigned int i = 0;
723 i = 0;
724 const char * 605 const char *p;
725 p;
726 606
727 /* use the one-at-a-time hash function, which supposedly is 607 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 608 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 609 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 610 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 625
746/* 626/*
747 * Finds, using the hashtable, which archetype matches the given name. 627 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 628 * returns a pointer to the found archetype, otherwise NULL.
749 */ 629 */
750
751archetype * 630archetype *
752find_archetype (const char *name) 631archetype::find (const char *name)
753{ 632{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 633 if (!name)
758 return 0; 634 return 0;
759 635
760 HT::const_iterator i = ht.find ((size_t)name); 636 AUTODECL (i, ht.find (name));
761 637
762 if (i == ht.end ()) 638 if (i == ht.end ())
763 return 0; 639 return 0;
764 else 640 else
765 return i->second; 641 return i->second;
766#endif
767
768 archetype *at;
769 unsigned long index;
770
771 if (name == NULL)
772 return (archetype *) NULL;
773
774 index = hasharch (name, ARCHTABLE);
775 arch_search++;
776 for (;;)
777 {
778 at = arch_table[index];
779 if (at == NULL)
780 {
781 if (warn_archetypes)
782 LOG (llevError, "Couldn't find archetype %s\n", name);
783 return NULL;
784 }
785 arch_cmp++;
786 if (!strcmp ((const char *) at->name, name))
787 return at;
788 if (++index >= ARCHTABLE)
789 index = 0;
790 }
791} 642}
792 643
793/* 644/*
794 * Adds an archetype to the hashtable. 645 * Adds an archetype to the hashtable.
795 */ 646 */
796 647void
797static void 648archetype::hash_add ()
798add_arch (archetype *at)
799{ 649{
800#if USE_UNORDERED_MAP 650 ht.insert (std::make_pair (name, this));
801 ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); 651}
802#endif
803 652
804 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 653void
805 654archetype::hash_del ()
806 for (;;) 655{
807 { 656 ht.erase (name);
808 if (arch_table[index] == NULL)
809 {
810 arch_table[index] = at;
811 return;
812 }
813
814 if (++index == ARCHTABLE)
815 index = 0;
816
817 if (index == org_index)
818 fatal (ARCHTABLE_TOO_SMALL);
819 }
820} 657}
821 658
822/* 659/*
823 * Returns the first archetype using the given type. 660 * Returns the first archetype using the given type.
824 * Used in treasure-generation. 661 * Used in treasure-generation.
825 */ 662 */
826
827archetype * 663archetype *
828type_to_archetype (int type) 664type_to_archetype (int type)
829{ 665{
830 archetype * 666 archetype *at;
831 at;
832 667
833 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 668 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
834 if (at->clone.type == type) 669 if (at->clone.type == type)
835 return at; 670 return at;
671
836 return NULL; 672 return 0;
837} 673}
838 674
839/* 675/*
840 * Returns a new object copied from the first archetype matching 676 * Returns a new object copied from the first archetype matching
841 * the given type. 677 * the given type.
… …
843 */ 679 */
844 680
845object * 681object *
846clone_arch (int type) 682clone_arch (int type)
847{ 683{
848 archetype * 684 archetype *at;
849 at;
850 object *
851 op = get_object ();
852 685
853 if ((at = type_to_archetype (type)) == NULL) 686 if ((at = type_to_archetype (type)) == NULL)
854 { 687 {
855 LOG (llevError, "Can't clone archetype %d\n", type); 688 LOG (llevError, "Can't clone archetype %d\n", type);
856 free_object (op);
857 return NULL; 689 return 0;
858 } 690 }
859 copy_object (&at->clone, op); 691
692 object *op = at->clone.clone ();
860 op->instantiate (); 693 op->instantiate ();
861 return op; 694 return op;
862} 695}
863 696
864/* 697/*
865 * member: make instance from class 698 * member: make instance from class
866 */ 699 */
867 700
868object * 701object *
869object_create_arch (archetype * at) 702object_create_arch (archetype *at)
870{ 703{
871 object * 704 object *op, *prev = 0, *head = 0;
872 op, *
873 prev = NULL, *head = NULL;
874 705
875 while (at) 706 while (at)
876 { 707 {
877 op = arch_to_object (at); 708 op = arch_to_object (at);
878 op->x = at->clone.x; 709 op->x = at->clone.x;
879 op->y = at->clone.y; 710 op->y = at->clone.y;
711
880 if (head) 712 if (head)
881 op->head = head, prev->more = op; 713 op->head = head, prev->more = op;
714
882 if (!head) 715 if (!head)
883 head = op; 716 head = op;
717
884 prev = op; 718 prev = op;
885 at = at->more; 719 at = at->more;
886 } 720 }
721
887 return (head); 722 return (head);
888} 723}
889 724
890/*** end of arch.c ***/

Diff Legend

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