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.73 by root, Sun Apr 20 00:44:12 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
29#include <loader.h> 28#include <loader.h>
30 29
31#include <tr1/functional> 30#include <tr1/functional>
32#include <tr1/unordered_map> 31#include <tr1/unordered_map>
33 32
34int arch_init; /* True if doing arch initialization */ 33archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
35 34archetype *archetype::empty;
36/* The naming of these functions is really poor - they are all
37 * pretty much named '.._arch_...', but they may more may not
38 * return archetypes. Some make the arch_to_object call, and thus
39 * return an object. Perhaps those should be called 'archob' functions
40 * to denote they return an object derived from the archetype.
41 * MSW 2003-04-29
42 */
43 35
44// the hashtable 36// the hashtable
45typedef std::tr1::unordered_map 37typedef std::tr1::unordered_map
46 < 38 <
47 const char *, 39 const char *,
50 str_equal, 42 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 44 > HT;
53 45
54static HT ht (5000); 46static HT ht (5000);
47archvec archetypes;
48
49// the vector of other_arch references to be resolved
50static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
51// the vector of loaded but not yet committed archetypes
52static std::vector<archetype *> postponed_arch;
55 53
56/** 54/**
57 * GROS - This function retrieves an archetype given the name that appears 55 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 56 * 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. 57 * It does not use the hashtable system, but browse the whole archlist each time.
65 * - the archetype found or null if nothing was found. 63 * - the archetype found or null if nothing was found.
66 */ 64 */
67archetype * 65archetype *
68find_archetype_by_object_name (const char *name) 66find_archetype_by_object_name (const char *name)
69{ 67{
70 archetype *at; 68 shstr_cmp name_cmp (name);
71 69
72 if (name == NULL) 70 for_all_archetypes (at)
73 return (archetype *) NULL; 71 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; 72 return at;
79 } 73
80 return NULL; 74 return 0;
81} 75}
82 76
83/** 77/**
84 * This function retrieves an archetype by type and name that appears during 78 * 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() 79 * the game. It is basically the same as find_archetype_by_object_name()
86 * except that it considers only items of the given type. 80 * except that it considers only items of the given type.
87 */ 81 */
88archetype * 82archetype *
89find_archetype_by_object_type_name (int type, const char *name) 83find_archetype_by_object_type_name (int type, const char *name)
90{ 84{
91 archetype *at; 85 shstr_cmp name_cmp (name);
92 86
93 if (name == NULL) 87 for_all_archetypes (at)
94 return NULL; 88 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; 89 return at;
100 }
101 90
102 return NULL; 91 return 0;
103} 92}
104 93
105/* This is a lot like the above function. Instead, we are trying to match 94/* 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 95 * 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). 96 * against (eg, to only match against skills or only skill objects for example).
108 * If type is -1, ew don't match on type. 97 * If type is -1, ew don't match on type.
109 */ 98 */
110object * 99object *
111get_archetype_by_skill_name (const char *skill, int type) 100get_archetype_by_skill_name (const char *skill, int type)
112{ 101{
113 archetype *at; 102 shstr_cmp skill_cmp (skill);
114 103
115 if (skill) 104 for_all_archetypes (at)
116 for (at = first_archetype; at; at = at->next) 105 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); 106 return arch_to_object (at);
119 107
120 return 0; 108 return 0;
121} 109}
122 110
123/* similiar to above - this returns the first archetype 111/* similiar to above - this returns the first archetype
128 * (eg, skills) 116 * (eg, skills)
129 */ 117 */
130archetype * 118archetype *
131get_archetype_by_type_subtype (int type, int subtype) 119get_archetype_by_type_subtype (int type, int subtype)
132{ 120{
133 archetype * 121 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)) 122 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
139 return at; 123 return at;
140 } 124
141 return NULL; 125 return 0;
142} 126}
143 127
144/** 128/**
145 * GROS - this returns a new object given the name that appears during the game 129 * GROS - this returns a new object given the name that appears during the game
146 * (for example, "writing pen" instead of "stylus"). 130 * (for example, "writing pen" instead of "stylus").
154 * but it otherwise had a big memory leak. 138 * but it otherwise had a big memory leak.
155 */ 139 */
156object * 140object *
157get_archetype_by_object_name (const char *name) 141get_archetype_by_object_name (const char *name)
158{ 142{
159 archetype *at;
160 char tmpname[MAX_BUF]; 143 char tmpname[MAX_BUF];
161 int i; 144 int i;
162 145
163 assign (tmpname, name); 146 assign (tmpname, name);
164 147
165 for (i = strlen (tmpname); i > 0; i--) 148 for (i = strlen (tmpname); i > 0; i--)
166 { 149 {
167 tmpname[i] = 0; 150 tmpname[i] = 0;
151
168 at = find_archetype_by_object_name (tmpname); 152 if (archetype *at = find_archetype_by_object_name (tmpname))
169
170 if (at)
171 return arch_to_object (at); 153 return arch_to_object (at);
172 } 154 }
173 155
174 return create_singularity (name); 156 return create_singularity (name);
175} 157}
176 158
177 /* This is a subset of the parse_id command. Basically, name can be 159/* 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. 160 * a string seperated lists of things to match, with certain keywords.
179 * pl is the player (only needed to set count properly) 161 * pl is the player (only needed to set count properly)
180 * op is the item we are trying to match. Calling function takes care 162 * 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 163 * 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 164 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
183 * value means a better match. 0 means no match. 165 * value means a better match. 0 means no match.
184 * 166 *
185 * Brief outline of the procedure: 167 * Brief outline of the procedure:
186 * We take apart the name variable into the individual components. 168 * We take apart the name variable into the individual components.
187 * cases for 'all' and unpaid are pretty obvious. 169 * cases for 'all' and unpaid are pretty obvious.
188 * Next, we check for a count (either specified in name, or in the 170 * Next, we check for a count (either specified in name, or in the
189 * player object.) 171 * player object.)
190 * If count is 1, make a quick check on the name. 172 * 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. 173 * IF count is >1, we need to make plural name. Return if match.
192 * Last, make a check on the full name. 174 * Last, make a check on the full name.
193 */ 175 */
194int 176int
195item_matched_string (object *pl, object *op, const char *name) 177item_matched_string (object *pl, object *op, const char *name)
196{ 178{
197 char *cp, local_name[MAX_BUF]; 179 char *cp, local_name[MAX_BUF];
198 int count, retval = 0; 180 int count, retval = 0;
199 181
200 strcpy (local_name, name); /* strtok is destructive to name */ 182 assign (local_name, name); /* strtok is destructive to name */
201 183
202 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 184 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
203 { 185 {
204 while (cp[0] == ' ') 186 while (cp[0] == ' ')
205 ++cp; /* get rid of spaces */ 187 ++cp; /* get rid of spaces */
290 } 272 }
291 273
292 return 0; 274 return 0;
293} 275}
294 276
295/* 277archetype::archetype (const char *name)
296 * Initialises the internal linked list of archetypes (read from file). 278{
297 * Then the global "empty_archetype" pointer is initialised. 279 arch = this;
298 * Then the blocksview[] array is initialised. 280 this->archname = this->name = this->name_pl = name;
299 */ 281}
282
283archetype::~archetype ()
284{
285 unlink ();
286}
300 287
301void 288void
302init_archetypes (void) 289archetype::link ()
303{ /* called from add_player() and edit() */ 290{
304 if (first_archetype != NULL) /* Only do this once */ 291 ht.insert (std::make_pair (archname, this));
305 return;
306 292
307 arch_init = 1; 293 if (!archetypes.contains (this))
308 load_archetypes (); 294 archetypes.insert (this);
309 arch_init = 0;
310 empty_archetype = archetype::find ("empty_archetype");
311
312/* init_blocksview();*/
313} 295}
314 296
315/*
316 * An alternative way to init the hashtable which is slower, but _works_...
317 */
318void 297void
319init_archetable (void) 298archetype::unlink ()
320{ 299{
300 ht.erase (archname);
301
302 if (archetypes.contains (this))
303 archetypes.erase (this);
304}
305
306/*
307 * Finds, using the hashtable, which archetype matches the given name.
308 * returns a pointer to the found archetype, otherwise NULL.
309 */
321 archetype *at; 310archetype *
311archetype::find (const char *name)
312{
313 if (!name)
314 return 0;
322 315
323 LOG (llevDebug, " Setting up archetable...\n"); 316 auto (i, ht.find (name));
324 317
325 for (at = first_archetype; at; at = at->more ? at->more : at->next) 318 if (i == ht.end ())
326 at->hash_add (); 319 return 0;
320 else
321 return i->second;
322}
327 323
328 LOG (llevDebug, "done\n"); 324archetype *
325archetype::read (object_thawer &f)
326{
327 assert (f.kw == KW_object);
328
329 std::vector<archetype *> parts;
330
331 coroapi::cede_to_tick ();
332
333 for (;;)
334 {
335 archetype *at = new archetype (f.get_str ());
336
337 f.next ();
338
339#if 0
340 // implementing it here in the server does neither allow multiple inheritence
341 // nor does it cleanly "just override". it would allow use in map files, though,
342 // and other resource files dynamically laoded (as opposed to being preprocessed).
343 // not that any of this is relevant as of yet...
344 if (f.kw == KW_inherit)
345 {
346 if (archetype *at = find (f.get_str ()))
347 *op = at->clone;
348 else
349 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
350 &at->archname, f.get_str ());
351
352 f.next ();
353 }
354#endif
355
356 loading_arch = at; // hack to tell parse_kv et al. to behave
357 bool parse_ok = at->parse_kv (f);
358 loading_arch = 0;
359
360 if (!parse_ok)
361 goto fail;
362
363 loading_arch = at; // hack to tell parse_kv et al. to behave
364 at->post_load_check ();
365 loading_arch = 0;
366
367 parts.push_back (at);
368
369 if (f.kw != KW_more)
370 break;
371
372 f.next ();
373
374 if (f.kw != KW_object)
375 {
376 f.parse_error ("more object");
377 goto fail;
378 }
379 }
380
381 {
382 auto (at, parts.begin ());
383
384 archetype *new_head = parts.front ();
385 archetype *old_head = find (new_head->archname);
386
387 if (old_head && !old_head->is_head ())
388 {
389 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
390 &new_head->archname, &old_head->archname);
391 goto fail;
392 }
393
394 // check that all archetypes belong to the same old object or are new
395 for (auto (at, parts.begin ()); at != parts.end (); ++at)
396 {
397 archetype *new_part = *at;
398 archetype *old_part = find (new_part->archname);
399
400 if (old_part && old_part->head_ () != old_head)
401 {
402 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
403 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
404 goto fail;
405 }
406 }
407
408 // assemble new chain
409 new_head->min_x = new_head->max_x = new_head->x;
410 new_head->min_y = new_head->max_y = new_head->y;
411
412 archetype *less = new_head;
413 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
414 {
415 archetype *at = *p;
416
417 // some flags get inherited formt he head (probably a lot more)
418 // doing it here doesn't feel too cozy, but it allows code
419 // to ignore head checks for these flags, which saves time
420 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
421 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
422 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
423 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
424
425 if (at->x < new_head->min_x) new_head->min_x = at->x;
426 if (at->y < new_head->min_y) new_head->min_y = at->y;
427 if (at->x > new_head->max_x) new_head->max_x = at->x;
428 if (at->y > new_head->max_y) new_head->max_y = at->y;
429
430 at->head = new_head;
431 less->more = at;
432 less = at;
433 }
434
435 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
436
437 return new_head;
438 }
439
440fail:
441 for (auto (p, parts.begin ()); p != parts.end (); ++p)
442 (*p)->destroy (true);
443
444 return 0;
329} 445}
330 446
331void 447void
332free_all_archs (void) 448archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
333{ 449{
334 archetype *at, *next; 450 ref = 0;
335 int i = 0, f = 0; 451 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
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} 452}
352 453
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 454void
368first_arch_pass (object_thawer & fp) 455archetype::commit_load ()
369{ 456{
370 archetype *head = 0, *last_more = 0; 457 // unlink old archetypes and link in new ones */
371 458 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
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 } 459 {
460 archetype *at = *p;
438 461
439 delete at; 462 if (archetype *old = find (at->archname))
440} 463 old->unlink ();
441 464
442/* 465 at->link ();
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 { 466 }
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 467
488 if (tl == NULL) 468 postponed_arch.clear ();
489 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 469
490 else 470 // now resolve arch references
491 at->clone.randomitems = tl; 471 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
492 }
493 }
494 } 472 {
495} 473 arch_ptr *ap = p->first;
474 archetype *at = find (p->second);
496 475
497#ifdef DEBUG 476 if (!at)
498void 477 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
499check_generators (void)
500{
501 archetype *at;
502 478
503 for (at = first_archetype; at != NULL; at = at->next) 479 *ap = at;
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 } 480 }
532 481
533 init_archetable (); 482 postponed_arch_ref.clear ();
534 warn_archetypes = 1;
535 483
536 { 484 empty = find (shstr_empty_archetype);
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} 485}
552 486
553/* 487/*
554 * Creates and returns a new object which is a copy of the given archetype. 488 * Creates and returns a new object which is a copy of the given archetype.
555 * This function returns NULL on failure. 489 * This function returns NULL on failure.
556 */ 490 */
557object * 491object *
558arch_to_object (archetype *at) 492arch_to_object (archetype *at)
559{ 493{
560 object *op; 494 if (!at)
561
562 if (at == NULL)
563 { 495 {
564 if (warn_archetypes)
565 LOG (llevError, "Couldn't find archetype.\n"); 496 LOG (llevError, "Couldn't find archetype.\n");
566
567 return NULL; 497 return 0;
568 } 498 }
569 499
570 op = at->clone.clone (); 500 object *op = at->clone ();
571 op->arch = at; 501 op->arch = at;
572 op->instantiate (); 502 op->instantiate ();
503
573 return op; 504 return op;
505}
506
507object *
508archetype::instance ()
509{
510 return arch_to_object (this);
574} 511}
575 512
576/* 513/*
577 * Creates an object. This function is called by get_archetype() 514 * Creates an object. This function is called by get_archetype()
578 * if it fails to find the appropriate archetype. 515 * if it fails to find the appropriate archetype.
580 * an object, and never NULL. 517 * an object, and never NULL.
581 */ 518 */
582object * 519object *
583create_singularity (const char *name) 520create_singularity (const char *name)
584{ 521{
585 object *op; 522 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
523
524 if (!strcmp (name, "bug"))
525 abort ();
526
586 char buf[MAX_BUF]; 527 char buf[MAX_BUF];
528 sprintf (buf, "bug, please report (%s)", name);
587 529
588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 530 object *op = get_archetype ("bug");
589 op = object::create ();
590 op->name = op->name_pl = buf; 531 op->name = op->name_pl = buf;
591 SET_FLAG (op, FLAG_NO_PICK); 532
592 return op; 533 return op;
593} 534}
594 535
595/* 536/*
596 * Finds which archetype matches the given name, and returns a new 537 * Finds which archetype matches the given name, and returns a new
606 547
607 return arch_to_object (at); 548 return arch_to_object (at);
608} 549}
609 550
610/* 551/*
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. 552 * Returns the first archetype using the given type.
675 * Used in treasure-generation. 553 * Used in treasure-generation.
676 */ 554 */
677archetype * 555archetype *
678type_to_archetype (int type) 556type_to_archetype (int type)
679{ 557{
680 archetype *at; 558 for_all_archetypes (at)
681 559 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; 560 return at;
685 561
686 return 0; 562 return 0;
687} 563}
688 564
689/* 565/*
690 * Returns a new object copied from the first archetype matching 566 * Returns a new object copied from the first archetype matching
691 * the given type. 567 * the given type.
692 * Used in treasure-generation. 568 * Used in treasure-generation.
693 */ 569 */
694
695object * 570object *
696clone_arch (int type) 571clone_arch (int type)
697{ 572{
698 archetype *at; 573 archetype *at;
699 574
701 { 576 {
702 LOG (llevError, "Can't clone archetype %d\n", type); 577 LOG (llevError, "Can't clone archetype %d\n", type);
703 return 0; 578 return 0;
704 } 579 }
705 580
706 object *op = at->clone.clone (); 581 object *op = at->clone ();
707 op->instantiate (); 582 op->instantiate ();
708 return op; 583 return op;
709} 584}
710 585
711/* 586/*
712 * member: make instance from class 587 * member: make instance from class
713 */ 588 */
714
715object * 589object *
716object_create_arch (archetype *at) 590object_create_arch (archetype *at)
717{ 591{
718 object *op, *prev = 0, *head = 0; 592 object *op, *prev = 0, *head = 0;
719 593
720 while (at) 594 while (at)
721 { 595 {
722 op = arch_to_object (at); 596 op = arch_to_object (at);
597
723 op->x = at->clone.x; 598 op->x = at->x;
724 op->y = at->clone.y; 599 op->y = at->y;
725 600
726 if (head) 601 if (head)
727 op->head = head, prev->more = op; 602 op->head = head, prev->more = op;
728 603
729 if (!head) 604 if (!head)
730 head = op; 605 head = op;
731 606
732 prev = op; 607 prev = op;
733 at = at->more; 608 at = (archetype *)at->more;
734 } 609 }
735 610
736 return (head); 611 return head;
737} 612}
738 613

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines