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.38 by root, Fri Feb 2 21:50:43 2007 UTC vs.
Revision 1.66 by root, Thu Jun 7 19:12:22 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <funcpoint.h> 28#include <funcpoint.h>
29#include <loader.h> 29#include <loader.h>
30 30
31#include <tr1/functional> 31#include <tr1/functional>
32#include <tr1/unordered_map> 32#include <tr1/unordered_map>
33
34int arch_init; /* True if doing arch initialization */
35 33
36/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
37 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
38 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
39 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
40 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
41 * MSW 2003-04-29 39 * MSW 2003-04-29
42 */ 40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43 43
44// the hashtable 44// the hashtable
45typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
46 < 46 <
47 const char *, 47 const char *,
50 str_equal, 50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 52 > HT;
53 53
54static HT ht (5000); 54static HT ht (5000);
55archvec archetypes;
55 56
56/** 57/**
57 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
59 * 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.
65 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
66 */ 67 */
67archetype * 68archetype *
68find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
69{ 70{
70 archetype *at; 71 shstr_cmp name_cmp (name);
71 72
72 if (name == NULL) 73 for_all_archetypes (at)
73 return (archetype *) NULL; 74 if (at->name == name_cmp)
74
75 for (at = first_archetype; at != NULL; at = at->next)
76 {
77 if (!strcmp (at->clone.name, name))
78 return at; 75 return at;
79 } 76
80 return NULL; 77 return 0;
81} 78}
82 79
83/** 80/**
84 * 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
85 * 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()
86 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
87 */ 84 */
88archetype * 85archetype *
89find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
90{ 87{
91 archetype *at; 88 shstr_cmp name_cmp (name);
92 89
93 if (name == NULL) 90 for_all_archetypes (at)
94 return NULL; 91 if (at->name == name_cmp && at->type == type)
95
96 for (at = first_archetype; at != NULL; at = at->next)
97 {
98 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
99 return at; 92 return at;
100 }
101 93
102 return NULL; 94 return 0;
103} 95}
104 96
105/* 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
106 * 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
107 * 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).
108 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
109 */ 101 */
110object * 102object *
111get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
112{ 104{
113 archetype *at; 105 shstr_cmp skill_cmp (skill);
114 106
115 if (skill) 107 for_all_archetypes (at)
116 for (at = first_archetype; at; at = at->next) 108 if (at->skill == skill_cmp && (type == -1 || type == at->type))
117 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
118 return arch_to_object (at); 109 return arch_to_object (at);
119 110
120 return 0; 111 return 0;
121} 112}
122 113
123/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
128 * (eg, skills) 119 * (eg, skills)
129 */ 120 */
130archetype * 121archetype *
131get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
132{ 123{
133 archetype * 124 for_all_archetypes (at)
134 at;
135
136 for (at = first_archetype; at != NULL; at = at->next)
137 {
138 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
139 return at; 126 return at;
140 } 127
141 return NULL; 128 return 0;
142} 129}
143 130
144/** 131/**
145 * 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
146 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
154 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
155 */ 142 */
156object * 143object *
157get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
158{ 145{
159 archetype *at;
160 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
161 int i; 147 int i;
162 148
163 assign (tmpname, name); 149 assign (tmpname, name);
164 150
165 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
166 { 152 {
167 tmpname[i] = 0; 153 tmpname[i] = 0;
154
168 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
169
170 if (at)
171 return arch_to_object (at); 156 return arch_to_object (at);
172 } 157 }
173 158
174 return create_singularity (name); 159 return create_singularity (name);
175} 160}
176 161
177 /* 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
178 * a string seperated lists of things to match, with certain keywords. 163 * a string seperated lists of things to match, with certain keywords.
179 * pl is the player (only needed to set count properly) 164 * pl is the player (only needed to set count properly)
180 * op is the item we are trying to match. Calling function takes care 165 * op is the item we are trying to match. Calling function takes care
181 * of what action might need to be done and if it is valid 166 * of what action might need to be done and if it is valid
182 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
183 * value means a better match. 0 means no match. 168 * value means a better match. 0 means no match.
184 * 169 *
185 * Brief outline of the procedure: 170 * Brief outline of the procedure:
186 * We take apart the name variable into the individual components. 171 * We take apart the name variable into the individual components.
187 * cases for 'all' and unpaid are pretty obvious. 172 * cases for 'all' and unpaid are pretty obvious.
188 * Next, we check for a count (either specified in name, or in the 173 * Next, we check for a count (either specified in name, or in the
189 * player object.) 174 * player object.)
190 * If count is 1, make a quick check on the name. 175 * If count is 1, make a quick check on the name.
191 * 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.
192 * Last, make a check on the full name. 177 * Last, make a check on the full name.
193 */ 178 */
194int 179int
195item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
196{ 181{
197 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
198 int count, retval = 0; 183 int count, retval = 0;
199 184
200 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
201 186
202 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
203 { 188 {
204 while (cp[0] == ' ') 189 while (cp[0] == ' ')
205 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
290 } 275 }
291 276
292 return 0; 277 return 0;
293} 278}
294 279
295/* 280archetype::archetype (const char *name)
296 * Initialises the internal linked list of archetypes (read from file). 281{
297 * Then the global "empty_archetype" pointer is initialised. 282 stub = true;
298 * Then the blocksview[] array is initialised. 283 arch = this;
299 */ 284 this->archname = this->name = this->name_pl = name;
285}
286
287archetype::~archetype ()
288{
289 unlink ();
290}
300 291
301void 292void
302init_archetypes (void) 293archetype::link ()
303{ /* called from add_player() and edit() */ 294{
304 if (first_archetype != NULL) /* Only do this once */ 295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this))
298 archetypes.insert (this);
299}
300
301void
302archetype::unlink ()
303{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this))
307 archetypes.erase (this);
308}
309
310/*
311 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL.
313 */
314archetype *
315archetype::find (const char *name)
316{
317 if (!name)
305 return; 318 return 0;
306 319
307 arch_init = 1; 320 auto (i, ht.find (name));
308 load_archetypes (); 321
309 arch_init = 0; 322 if (i == ht.end ())
323 return 0;
324 else
325 return i->second;
326}
327
328archetype *
329archetype::get (const char *name)
330{
331 if (!name)
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336
337 archetype *at = find (name);
338
339 if (!at)
340 {
341 at = new archetype (name);
342 at->link ();
343 }
344
345 return at;
346}
347
348archetype *
349archetype::read (object_thawer &f)
350{
351 assert (f.kw == KW_object);
352
353 loading_arch = true; // hack to tell parse_kv et al. to behave
354
355 std::vector<archetype *> parts;
356
357 coroapi::cede_to_tick_every (10);
358
359 for (;;)
360 {
361 // the archetype might have been referenced earlier
362 // so try to find an existing stub archetype first
363 archetype *at = find (f.get_str ());
364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367
368 f.next ();
369
370#if 0
371 // implementing it here in the server does neither allow multiple inheritence
372 // nor does it cleanly "just override". it would allow use in map files, though,
373 // and other resource files dynamically laoded (as opposed to being preprocessed).
374 // not that any of this is relevant as of yet...
375 if (f.kw == KW_inherit)
376 {
377 if (archetype *at = find (f.get_str ()))
378 *op = at->clone;
379 else
380 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
381 &at->archname, f.get_str ());
382
383 f.next ();
384 }
385#endif
386
387 if (!at->parse_kv (f))
388 goto fail;
389
390 at->post_load_check ();
391
392 parts.push_back (at);
393
394 if (f.kw != KW_more)
395 break;
396
397 f.next ();
398
399 if (f.kw != KW_object)
400 {
401 f.parse_error ("more object");
402 goto fail;
403 }
404 }
405
406 loading_arch = false;
407
408 {
409 auto (at, parts.begin ());
410
411 archetype *new_head = parts.front ();
412 archetype *old_head = find (new_head->archname);
413
414 if (old_head && !old_head->is_head ())
415 {
416 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
417 &new_head->archname, &old_head->archname);
418 goto fail;
419 }
420
421 // check that all archetypes belong to the same old object or are new
422 for (auto (at, parts.begin ()); at != parts.end (); ++at)
423 {
424 archetype *new_part = *at;
425 archetype *old_part = find (new_part->archname);
426
427 if (old_part && old_part->head_ () != old_head)
428 {
429 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
430 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
431 goto fail;
432 }
433 }
434
435 // deactivate existing archetype
436 for (archetype *at = old_head; at; at = (archetype *)at->more)
437 at->unlink ();
438
439 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y;
442
443 archetype *less = new_head;
444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
445 {
446 archetype *at = *p;
447
448 if (at->x < new_head->min_x) new_head->min_x = at->x;
449 if (at->y < new_head->min_y) new_head->min_y = at->y;
450 if (at->x > new_head->max_x) new_head->max_x = at->x;
451 if (at->y > new_head->max_y) new_head->max_y = at->y;
452
453 at->head = new_head;
454 less->more = at;
455 less = at;
456 }
457
458 // now activate it
459 for (auto (p, parts.begin ()); p != parts.end (); ++p)
460 {
461 archetype *at = *p;
462 at->stub = false;
463 at->link ();
464 }
465
466 return new_head;
467 }
468
469fail:
470 for (auto (p, parts.begin ()); p != parts.end (); ++p)
471 (*p)->destroy (true);
472
473 loading_arch = false;
474 return 0;
475}
476
477/*
478 * Initialize global archtype pointers:
479 */
480void
481init_archetype_pointers ()
482{
483 ring_arch = archetype::find ("ring");
484 amulet_arch = archetype::find ("amulet");
485 staff_arch = archetype::find ("staff");
486 crown_arch = archetype::find ("crown");
310 empty_archetype = archetype::find ("empty_archetype"); 487 empty_archetype = archetype::find ("empty_archetype");
311
312/* init_blocksview();*/
313}
314
315/*
316 * An alternative way to init the hashtable which is slower, but _works_...
317 */
318void
319init_archetable (void)
320{
321 archetype *at;
322
323 LOG (llevDebug, " Setting up archetable...\n");
324
325 for (at = first_archetype; at; at = at->more ? at->more : at->next)
326 at->hash_add ();
327
328 LOG (llevDebug, "done\n");
329}
330
331void
332free_all_archs (void)
333{
334 archetype *at, *next;
335 int i = 0, f = 0;
336
337 for (at = first_archetype; at; at = next)
338 {
339 if (at->more)
340 next = at->more;
341 else
342 next = at->next;
343
344 delete
345 at;
346
347 i++;
348 }
349
350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
351}
352
353archetype::archetype ()
354{
355 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
357}
358
359archetype::~archetype ()
360{
361}
362
363/*
364 * Reads/parses the archetype-file, and copies into a linked list
365 * of archetype-structures.
366 */
367void
368first_arch_pass (object_thawer & fp)
369{
370 archetype *head = 0, *last_more = 0;
371
372 archetype *at = new archetype;
373 at->clone.arch = first_archetype = at;
374
375 while (int i = load_object (fp, &at->clone, 0))
376 {
377 at->clone.speed_left = (float) (-0.1);
378 /* copy the body_info to the body_used - this is only really
379 * need for monsters, but doesn't hurt to do it for everything.
380 * by doing so, when a monster is created, it has good starting
381 * values for the body_used info, so when items are created
382 * for it, they can be properly equipped.
383 */
384 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
385
386 switch (i)
387 {
388 case LL_NORMAL: /* A new archetype, just link it with the previous */
389 if (last_more != NULL)
390 last_more->next = at;
391 if (head != NULL)
392 head->next = at;
393 head = last_more = at;
394#if 0
395 if (!op->type)
396 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
397#endif
398 at->tail_x = 0;
399 at->tail_y = 0;
400 break;
401
402 case LL_MORE: /* Another part of the previous archetype, link it correctly */
403
404 at->head = head;
405 at->clone.head = &head->clone;
406 if (last_more != NULL)
407 {
408 last_more->more = at;
409 last_more->clone.more = &at->clone;
410 }
411 last_more = at;
412
413 /* If this multipart image is still composed of individual small
414 * images, don't set the tail_.. values. We can't use them anyways,
415 * and setting these to zero makes the map sending to the client much
416 * easier as just looking at the head, we know what to do.
417 */
418 if (at->clone.face != head->clone.face)
419 {
420 head->tail_x = 0;
421 head->tail_y = 0;
422 }
423 else
424 {
425 if (at->clone.x > head->tail_x)
426 head->tail_x = at->clone.x;
427 if (at->clone.y > head->tail_y)
428 head->tail_y = at->clone.y;
429 }
430 break;
431
432 }
433
434 at = new archetype;
435
436 at->clone.arch = at;
437 }
438
439 delete at;
440}
441
442/*
443 * Reads the archetype file once more, and links all pointers between
444 * archetypes.
445 */
446
447void
448second_arch_pass (object_thawer & thawer)
449{
450 char buf[MAX_BUF], *variable = buf, *argument, *cp;
451 archetype *at = NULL, *other;
452
453 while (fgets (buf, MAX_BUF, thawer) != NULL)
454 {
455 if (*buf == '#')
456 continue;
457 if ((argument = strchr (buf, ' ')) != NULL)
458 {
459 *argument = '\0', argument++;
460 cp = argument + strlen (argument) - 1;
461 while (isspace (*cp))
462 {
463 *cp = '\0';
464 cp--;
465 }
466 }
467 if (!strcmp ("Object", variable))
468 {
469 if ((at = archetype::find (argument)) == NULL)
470 LOG (llevError, "Warning: failed to find arch %s\n", argument);
471 }
472 else if (!strcmp ("other_arch", variable))
473 {
474 if (at != NULL && at->clone.other_arch == NULL)
475 {
476 if ((other = archetype::find (argument)) == NULL)
477 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
478 else if (at != NULL)
479 at->clone.other_arch = other;
480 }
481 }
482 else if (!strcmp ("randomitems", variable))
483 {
484 if (at != NULL)
485 {
486 treasurelist *tl = find_treasurelist (argument);
487
488 if (tl == NULL)
489 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
490 else
491 at->clone.randomitems = tl;
492 }
493 }
494 }
495}
496
497#ifdef DEBUG
498void
499check_generators (void)
500{
501 archetype *at;
502
503 for (at = first_archetype; at != NULL; at = at->next)
504 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
505 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
506}
507#endif
508
509/*
510 * First initialises the archtype hash-table (init_archetable()).
511 * Reads and parses the archetype file (with the first and second-pass
512 * functions).
513 * Then initialises treasures by calling load_treasures().
514 */
515
516void
517load_archetypes (void)
518{
519 char filename[MAX_BUF];
520
521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
523
524 {
525 object_thawer
526 thawer (filename);
527
528 LOG (llevDebug, " arch-pass 1...\n");
529 first_arch_pass (thawer);
530 LOG (llevDebug, " done\n");
531 }
532
533 init_archetable ();
534 warn_archetypes = 1;
535
536 {
537 object_thawer
538 thawer (filename);
539
540 LOG (llevDebug, " loading treasure...\n");
541 load_treasures ();
542 LOG (llevDebug, " done\n");
543 LOG (llevDebug, " arch-pass 2...\n");
544 second_arch_pass (thawer);
545 LOG (llevDebug, " done\n");
546#ifdef DEBUG
547 check_generators ();
548#endif
549 }
550 LOG (llevDebug, " done\n");
551} 488}
552 489
553/* 490/*
554 * Creates and returns a new object which is a copy of the given archetype. 491 * Creates and returns a new object which is a copy of the given archetype.
555 * This function returns NULL on failure. 492 * This function returns NULL on failure.
556 */ 493 */
557object * 494object *
558arch_to_object (archetype *at) 495arch_to_object (archetype *at)
559{ 496{
560 object *op; 497 if (!at)
561
562 if (at == NULL)
563 { 498 {
564 if (warn_archetypes)
565 LOG (llevError, "Couldn't find archetype.\n"); 499 LOG (llevError, "Couldn't find archetype.\n");
566
567 return NULL; 500 return 0;
568 } 501 }
569 502
570 op = at->clone.clone (); 503 object *op = at->clone ();
571 op->arch = at; 504 op->arch = at;
572 op->instantiate (); 505 op->instantiate ();
506
573 return op; 507 return op;
574} 508}
575 509
576/* 510/*
577 * Creates an object. This function is called by get_archetype() 511 * Creates an object. This function is called by get_archetype()
580 * an object, and never NULL. 514 * an object, and never NULL.
581 */ 515 */
582object * 516object *
583create_singularity (const char *name) 517create_singularity (const char *name)
584{ 518{
585 object *op; 519 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
520
521 if (!strcmp (name, "bug"))
522 abort ();
523
586 char buf[MAX_BUF]; 524 char buf[MAX_BUF];
525 sprintf (buf, "bug, please report (%s)", name);
587 526
588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 527 object *op = get_archetype ("bug");
589 op = object::create ();
590 op->name = op->name_pl = buf; 528 op->name = op->name_pl = buf;
591 SET_FLAG (op, FLAG_NO_PICK); 529
592 return op; 530 return op;
593} 531}
594 532
595/* 533/*
596 * Finds which archetype matches the given name, and returns a new 534 * Finds which archetype matches the given name, and returns a new
606 544
607 return arch_to_object (at); 545 return arch_to_object (at);
608} 546}
609 547
610/* 548/*
611 * Hash-function used by the arch-hashtable.
612 */
613
614unsigned long
615hasharch (const char *str, int tablesize)
616{
617 unsigned long hash = 0;
618 unsigned int i = 0;
619 const char *p;
620
621 /* use the one-at-a-time hash function, which supposedly is
622 * better than the djb2-like one used by perl5.005, but
623 * certainly is better then the bug used here before.
624 * see http://burtleburtle.net/bob/hash/doobs.html
625 */
626 for (p = str; i < MAXSTRING && *p; p++, i++)
627 {
628 hash += *p;
629 hash += hash << 10;
630 hash ^= hash >> 6;
631 }
632
633 hash += hash << 3;
634 hash ^= hash >> 11;
635 hash += hash << 15;
636
637 return hash % tablesize;
638}
639
640/*
641 * Finds, using the hashtable, which archetype matches the given name.
642 * returns a pointer to the found archetype, otherwise NULL.
643 */
644archetype *
645archetype::find (const char *name)
646{
647 if (!name)
648 return 0;
649
650 AUTODECL (i, ht.find (name));
651
652 if (i == ht.end ())
653 return 0;
654 else
655 return i->second;
656}
657
658/*
659 * Adds an archetype to the hashtable.
660 */
661void
662archetype::hash_add ()
663{
664 ht.insert (std::make_pair (name, this));
665}
666
667void
668archetype::hash_del ()
669{
670 ht.erase (name);
671}
672
673/*
674 * Returns the first archetype using the given type. 549 * Returns the first archetype using the given type.
675 * Used in treasure-generation. 550 * Used in treasure-generation.
676 */ 551 */
677archetype * 552archetype *
678type_to_archetype (int type) 553type_to_archetype (int type)
679{ 554{
680 archetype *at; 555 for_all_archetypes (at)
681 556 if (at->type == type && at->head_ () != at)
682 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
683 if (at->clone.type == type)
684 return at; 557 return at;
685 558
686 return 0; 559 return 0;
687} 560}
688 561
689/* 562/*
690 * Returns a new object copied from the first archetype matching 563 * Returns a new object copied from the first archetype matching
691 * the given type. 564 * the given type.
692 * Used in treasure-generation. 565 * Used in treasure-generation.
693 */ 566 */
694
695object * 567object *
696clone_arch (int type) 568clone_arch (int type)
697{ 569{
698 archetype *at; 570 archetype *at;
699 571
701 { 573 {
702 LOG (llevError, "Can't clone archetype %d\n", type); 574 LOG (llevError, "Can't clone archetype %d\n", type);
703 return 0; 575 return 0;
704 } 576 }
705 577
706 object *op = at->clone.clone (); 578 object *op = at->clone ();
707 op->instantiate (); 579 op->instantiate ();
708 return op; 580 return op;
709} 581}
710 582
711/* 583/*
712 * member: make instance from class 584 * member: make instance from class
713 */ 585 */
714
715object * 586object *
716object_create_arch (archetype *at) 587object_create_arch (archetype *at)
717{ 588{
718 object *op, *prev = 0, *head = 0; 589 object *op, *prev = 0, *head = 0;
719 590
720 while (at) 591 while (at)
721 { 592 {
722 op = arch_to_object (at); 593 op = arch_to_object (at);
594
723 op->x = at->clone.x; 595 op->x = at->x;
724 op->y = at->clone.y; 596 op->y = at->y;
725 597
726 if (head) 598 if (head)
727 op->head = head, prev->more = op; 599 op->head = head, prev->more = op;
728 600
729 if (!head) 601 if (!head)
730 head = op; 602 head = op;
731 603
732 prev = op; 604 prev = op;
733 at = at->more; 605 at = (archetype *)at->more;
734 } 606 }
735 607
736 return (head); 608 return head;
737} 609}
738 610

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines