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

Diff Legend

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