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.47 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.90 by root, Fri Oct 16 00:30:19 2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
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 <support@deliantra.net>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <funcpoint.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
34/* The naming of these functions is really poor - they are all
35 * pretty much named '.._arch_...', but they may more may not
36 * return archetypes. Some make the arch_to_object call, and thus
37 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29
40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34arch_ptr archetype::empty;
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 *,
… …
49 str_hash, 41 str_hash,
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 (10000);
47archvec archetypes;
48static unordered_vector<archetype *> allarch;
49static int dirtycnt;
50
51// the vector of other_arch references to be resolved
52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
53// the vector of loaded but not yet committed archetypes
55static std::vector<archetype *> archetypes; 54static std::vector<archetype *> postponed_arch;
56 55
57/** 56/**
58 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
60 * 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.
… …
68archetype * 67archetype *
69find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
70{ 69{
71 shstr_cmp name_cmp (name); 70 shstr_cmp name_cmp (name);
72 71
73 for (archetype *at = first_archetype; at; at = at->next) 72 for_all_archetypes (at)
74 if (at->clone.name == name_cmp) 73 if (at->name == name_cmp)
75 return at; 74 return at;
76 75
77 return 0; 76 return 0;
78} 77}
79 78
… …
85archetype * 84archetype *
86find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
87{ 86{
88 shstr_cmp name_cmp (name); 87 shstr_cmp name_cmp (name);
89 88
90 for (archetype *at = first_archetype; at; at = at->next) 89 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.type == type) 90 if (at->name == name_cmp && at->type == type)
92 return at; 91 return at;
93 92
94 return 0; 93 return 0;
95} 94}
96 95
… …
102object * 101object *
103get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
104{ 103{
105 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
106 105
107 for (archetype *at = first_archetype; at; at = at->next) 106 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 108 return at->instance ();
110 109
111 return 0; 110 return 0;
112} 111}
113 112
114/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
… …
119 * (eg, skills) 118 * (eg, skills)
120 */ 119 */
121archetype * 120archetype *
122get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
123{ 122{
124 for (archetype *at = first_archetype; at; at = at->next) 123 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 125 return at;
127 126
128 return 0; 127 return 0;
129} 128}
130 129
… …
135 * - name: The name we're searching for (ex: "writing pen"); 134 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 135 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 136 * - a corresponding object if found; a singularity object if not found.
138 * Note by MSW - it appears that it takes the full name and keeps 137 * Note by MSW - it appears that it takes the full name and keeps
139 * shortening it until it finds a match. I re-wrote this so that it 138 * shortening it until it finds a match. I re-wrote this so that it
140 * doesn't malloc it each time - not that this function is used much, 139 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
142 */ 141 */
143object * 142object *
144get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
145{ 144{
146 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
147 int i;
148 146
149 assign (tmpname, name); 147 assign (tmpname, name);
150 148
151 for (i = strlen (tmpname); i > 0; i--) 149 for (int i = strlen (tmpname); i > 0; i--)
152 { 150 {
153 tmpname[i] = 0; 151 tmpname[i] = 0;
154 152
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 153 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 154 return at->instance ();
157 } 155 }
158 156
159 return create_singularity (name); 157 return create_singularity (name);
160} 158}
161 159
162 /* This is a subset of the parse_id command. Basically, name can be 160/* This is a subset of the parse_id command. Basically, name can be
163 * a string seperated lists of things to match, with certain keywords. 161 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 162 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 163 * op is the item we are trying to match. Calling function takes care
166 * of what action might need to be done and if it is valid 164 * of what action might need to be done and if it is valid
167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 165 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 166 * value means a better match. 0 means no match.
169 * 167 *
170 * Brief outline of the procedure: 168 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 169 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 170 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 171 * Next, we check for a count (either specified in name, or in the
174 * player object.) 172 * player object.)
175 * If count is 1, make a quick check on the name. 173 * If count is 1, make a quick check on the name.
176 * IF count is >1, we need to make plural name. Return if match. 174 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 175 * Last, make a check on the full name.
178 */ 176 */
179int 177int
180item_matched_string (object *pl, object *op, const char *name) 178item_matched_string (object *pl, object *op, const char *name)
181{ 179{
182 char *cp, local_name[MAX_BUF]; 180 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 181 int count, retval = 0;
… …
195 return 1; 193 return 1;
196 194
197 /* unpaid is a little more specific */ 195 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
199 return 2; 197 return 2;
198
200 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 199 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
201 return 2; 200 return 2;
202 201
203 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
204 return 2; 203 return 2;
… …
260 retval = 6; 259 retval = 6;
261 /* base name matched - not bad */ 260 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 262 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name.contains (cp))
266 retval = 3; 265 retval = 3;
267 266
268 if (retval) 267 if (retval)
269 { 268 {
270 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
… …
275 } 274 }
276 275
277 return 0; 276 return 0;
278} 277}
279 278
279archetype::archetype (const char *name)
280{
281 arch = this;
282 this->archname = this->name = this->name_pl = name;
283}
284
285archetype::~archetype ()
286{
287 unlink ();
288}
289
280void 290void
281init_archetypes (void) 291archetype::link ()
282{ 292{
283 load_archetypes (); 293 if (!archetypes.contains (this))
284
285 empty_archetype = archetype::find ("empty_archetype");
286}
287
288archetype::archetype ()
289{
290 clone.arch = this;
291
292 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
293 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
294}
295
296archetype::~archetype ()
297{
298 //TODO: nuke ->more's
299}
300
301static void
302unlink (archetype *at)
303{
304 if (at->head)
305 at = at->head;
306
307 // destroy this archetype's link, making singletons out of its parts
308 while (at)
309 {
310 archetype *more = at->more;
311 at->clone.destroy_inv ();
312 at->head = at->more = 0;
313 at = more;
314 } 294 {
295 archetypes.insert (this);
296 ht.insert (std::make_pair (archname, this));
297 }
315} 298}
316 299
317// dire hack, need to rationalise
318void 300void
319overwrite (archetype *at, object *op) 301archetype::unlink ()
320{ 302{
321 at->clone = *op; 303 if (archetypes.contains (this))
322 304 {
323 at->clone.arch = at; 305 archetypes.erase (this);
324 //TODO: inv et al. 306 ht.erase (archname);
307 }
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)
318 return 0;
319
320 auto (i, ht.find (name));
321
322 if (i == ht.end ())
323 return 0;
324 else
325 return i->second;
325} 326}
326 327
327archetype * 328archetype *
328archetype::read (object_thawer &f) 329archetype::read (object_thawer &f)
329{ 330{
330 assert (f.kw == KW_object); 331 assert (f.kw == KW_object);
331 332
332 archetype *head = get (f.get_str ()); 333 std::vector<archetype *> parts;
333 unlink (head);
334 object *op = object::create ();
335 334
336 if (!op->parse_kv (f)) 335 coroapi::cede_to_tick ();
337 { 336
338 op->destroy (true); 337 for (;;)
339 // leak head
340 return 0;
341 } 338 {
339 archetype *at = new archetype (f.get_str ());
342 340
343 overwrite (head, op);
344 op->destroy ();
345
346 for (archetype *prev = head; f.kw == KW_more; )
347 {
348 f.next (); 341 f.next ();
349 assert (f.kw == KW_object);
350 342
351 archetype *more = get (f.get_str ()); 343#if 0
352 unlink (more); 344 // implementing it here in the server does neither allow multiple inheritence
353 object *op = object::create (); 345 // nor does it cleanly "just override". it would allow use in map files, though,
354 346 // and other resource files dynamically laoded (as opposed to being preprocessed).
355 if (!op->parse_kv (f)) 347 // not that any of this is relevant as of yet...
348 if (f.kw == KW_inherit)
356 { 349 {
357 op->destroy (true); 350 if (archetype *at = find (f.get_str ()))
358 // leak head more* 351 *op = at->clone;
359 return 0; 352 else
353 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
354 &at->archname, f.get_str ());
355
356 f.next ();
360 } 357 }
358#endif
361 359
362 overwrite (more, op); 360 loading_arch = at; // hack to tell parse_kv et al. to behave
363 op->destroy (); 361 bool parse_ok = at->parse_kv (f);
362 loading_arch = 0;
364 363
365 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 364 if (!parse_ok)
366 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 365 goto fail;
367 366
368 more->head = head; 367 loading_arch = at; // hack to tell parse_kv et al. to behave
369 more->clone.head = &head->clone; 368 at->post_load_check ();
370 prev->more = more; 369 loading_arch = 0;
371 prev->clone.more = &more->clone;
372 370
373 prev = more; 371 parts.push_back (at);
374 }
375 372
376 if (!head->next) 373 if (f.kw != KW_more)
377 { 374 break;
378 head->next = first_archetype;
379 first_archetype = head;
380 }
381 375
382 return head; 376 f.next ();
383}
384 377
385/* 378 if (f.kw != KW_object)
386 * Reads/parses the archetype-file, and copies into a linked list
387 * of archetype-structures.
388 */
389static bool
390load_archetypes (object_thawer &f)
391{
392 for (;;)
393 {
394 switch (f.kw)
395 { 379 {
396 case KW_object: 380 f.parse_error ("more object");
397 loading_arch = true; 381 goto fail;
398 if (!archetype::read (f))
399 {
400 loading_arch = false;
401 return false;
402 }
403
404 loading_arch = false;
405 continue;
406
407 case KW_EOF:
408 return true;
409
410 default:
411 if (!f.parse_error ("archetypes file"))
412 return false;
413 } 382 }
383 }
414 384
415 f.next (); 385 {
386 auto (at, parts.begin ());
387
388 archetype *new_head = parts.front ();
389 archetype *old_head = find (new_head->archname);
390
391 if (old_head && !old_head->is_head ())
392 {
393 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
394 &new_head->archname, &old_head->archname);
395 goto fail;
416 } 396 }
417}
418 397
419/* 398 // check that all archetypes belong to the same old object or are new
420 * First initialises the archtype hash-table (init_archetable()). 399 for (auto (at, parts.begin ()); at != parts.end (); ++at)
421 * Reads and parses the archetype file (with the first and second-pass 400 {
422 * functions). 401 archetype *new_part = *at;
423 */ 402 archetype *old_part = find (new_part->archname);
403
404 if (old_part && old_part->head_ () != old_head)
405 {
406 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
407 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
408 goto fail;
409 }
410 }
411
412 // assemble new chain
413 new_head->min_x = new_head->max_x = new_head->x;
414 new_head->min_y = new_head->max_y = new_head->y;
415
416 archetype *less = new_head;
417 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
418 {
419 archetype *at = *p;
420
421 // some flags get inherited from the head (probably a lot more)
422 // doing it here doesn't feel too cozy, but it allows code
423 // to ignore head checks for these flags, which saves time
424 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
425 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
426 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
427 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
428
429 new_head->min_x = min (new_head->min_x, at->x);
430 new_head->min_y = min (new_head->min_y, at->y);
431 new_head->max_x = max (new_head->max_x, at->x);
432 new_head->max_y = max (new_head->max_y, at->y);
433
434 at->head = new_head;
435 less->more = at;
436 less = at;
437 }
438
439 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
440
441 return new_head;
442 }
443
444fail:
445 for (auto (p, parts.begin ()); p != parts.end (); ++p)
446 (*p)->destroy ();
447
448 return 0;
449}
450
424void 451void
425load_archetypes (void) 452archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
426{ 453{
427 char filename[MAX_BUF]; 454 ref = 0;
428 455 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
429 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
430 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
431
432 object_thawer f (filename);
433
434 f.next ();
435
436 if (!load_archetypes (f))
437 cleanup ("unable to load archetypes");
438
439 warn_archetypes = 1;
440
441 load_treasures ();
442} 456}
443 457
444/* 458void
445 * Creates and returns a new object which is a copy of the given archetype. 459archetype::commit_load ()
446 * This function returns NULL on failure.
447 */
448object *
449arch_to_object (archetype *at)
450{ 460{
461 // unlink old archetypes and link in new ones */
462 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
463 {
464 archetype *at = *p;
465
466 if (archetype *old = find (at->archname))
467 old->unlink ();
468
469 allarch.push_back (at);
470
471 at->link ();
472 ++dirtycnt;
473 }
474
475 postponed_arch.clear ();
476
477 // now resolve arch references
478 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
479 {
480 arch_ptr *ap = p->first;
481 archetype *at = find (p->second);
482
451 if (!at) 483 if (!at)
484 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
485
486 *ap = at;
452 { 487 }
453 if (warn_archetypes)
454 LOG (llevError, "Couldn't find archetype.\n");
455 488
456 return NULL; 489 postponed_arch_ref.clear ();
490
491 empty = find (shstr_empty_archetype);
492}
493
494void
495archetype::gc ()
496{
497 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
498 dirtycnt = max (0, dirtycnt - cnt);
499
500 do
457 } 501 {
502 static int idx;
458 503
504 if (idx >= allarch.size ())
505 if (idx)
506 idx = 0;
507 else
508 return;
509
510 archetype *at = allarch [idx];
511
512 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
513 ++idx;
514 else
515 {
516 LOG (llevDebug, "garbage collect arch %s", &at->archname);
517 assert (at->arch == at); // verify that refcnt == 1 is truly valid
518 allarch.erase (idx);
519
520 // break chain
521 for (object *op = at->head_ (); op; )
522 {
523 object *next = op->more;
524 op->head = 0;
525 op->more = 0;
526 op = next;
527 }
528
529 at->destroy ();
530 at->arch = 0;
531 }
532 }
533 while (--cnt);
534}
535
536object *
537archetype::instance ()
538{
459 object *op = at->clone.clone (); 539 object *op = clone ();
460 op->arch = at;
461 op->instantiate (); 540 op->instantiate ();
462 return op; 541 return op;
463} 542}
464 543
465/* 544/*
… …
469 * an object, and never NULL. 548 * an object, and never NULL.
470 */ 549 */
471object * 550object *
472create_singularity (const char *name) 551create_singularity (const char *name)
473{ 552{
474 object *op; 553 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
475 char buf[MAX_BUF];
476 554
477 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 555 if (!strcmp (name, "bug"))
478 op = object::create (); 556 abort ();
479 op->name = op->name_pl = buf; 557
480 SET_FLAG (op, FLAG_NO_PICK); 558 object *op = archetype::get (shstr_bug);
559 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
560
481 return op; 561 return op;
482} 562}
483 563
484/* 564/*
485 * Finds which archetype matches the given name, and returns a new 565 * Finds which archetype matches the given name, and returns a new
486 * object containing a copy of the archetype. 566 * object containing a copy of the archetype.
487 */ 567 */
488object * 568object *
489get_archetype (const char *name) 569get_archetype (const char *name)
490{ 570{
571 return archetype::get (name);
572}
573
574object *
575archetype::get (const char *name)
576{
491 archetype *at = archetype::find (name); 577 archetype *at = find (name);
492 578
493 if (!at) 579 if (!at)
494 return create_singularity (name); 580 return create_singularity (name);
495 581
496 return arch_to_object (at); 582 return at->instance ();
497}
498
499/*
500 * Hash-function used by the arch-hashtable.
501 */
502
503unsigned long
504hasharch (const char *str, int tablesize)
505{
506 unsigned long hash = 0;
507 unsigned int i = 0;
508 const char *p;
509
510 /* use the one-at-a-time hash function, which supposedly is
511 * better than the djb2-like one used by perl5.005, but
512 * certainly is better then the bug used here before.
513 * see http://burtleburtle.net/bob/hash/doobs.html
514 */
515 for (p = str; i < MAXSTRING && *p; p++, i++)
516 {
517 hash += *p;
518 hash += hash << 10;
519 hash ^= hash >> 6;
520 }
521
522 hash += hash << 3;
523 hash ^= hash >> 11;
524 hash += hash << 15;
525
526 return hash % tablesize;
527}
528
529/*
530 * Finds, using the hashtable, which archetype matches the given name.
531 * returns a pointer to the found archetype, otherwise NULL.
532 */
533archetype *
534archetype::find (const char *name)
535{
536 if (!name)
537 return 0;
538
539 AUTODECL (i, ht.find (name));
540
541 if (i == ht.end ())
542 return 0;
543 else
544 return i->second;
545}
546
547archetype *
548archetype::get (const char *name)
549{
550 archetype *at = find (name);
551
552 if (!at)
553 {
554 archetypes.push_back (at = new archetype);
555 at->name = name;
556 at->hash_add ();
557 }
558
559 return at;
560}
561
562/*
563 * Adds an archetype to the hashtable.
564 */
565void
566archetype::hash_add ()
567{
568 ht.insert (std::make_pair (name, this));
569}
570
571void
572archetype::hash_del ()
573{
574 ht.erase (name);
575} 583}
576 584
577/* 585/*
578 * Returns the first archetype using the given type. 586 * Returns the first archetype using the given type.
579 * Used in treasure-generation. 587 * Used in treasure-generation.
580 */ 588 */
581archetype * 589archetype *
582type_to_archetype (int type) 590type_to_archetype (int type)
583{ 591{
584 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 592 for_all_archetypes (at)
585 if (at->clone.type == type) 593 if (at->type == type && at->head_ () != at)
586 return at; 594 return at;
587 595
588 return 0; 596 return 0;
589} 597}
590 598
… …
594 * Used in treasure-generation. 602 * Used in treasure-generation.
595 */ 603 */
596object * 604object *
597clone_arch (int type) 605clone_arch (int type)
598{ 606{
599 archetype *at; 607 archetype *at = type_to_archetype (type);
600 608
601 if ((at = type_to_archetype (type)) == NULL) 609 if (!at)
602 { 610 {
603 LOG (llevError, "Can't clone archetype %d\n", type); 611 LOG (llevError, "Can't clone archetype %d\n", type);
604 return 0; 612 return 0;
605 } 613 }
606 614
607 object *op = at->clone.clone (); 615 return at->instance ();
608 op->instantiate ();
609 return op;
610} 616}
611 617
612/* 618/*
613 * member: make instance from class 619 * member: make instance from class
614 */ 620 */
615
616object * 621object *
617object_create_arch (archetype *at) 622object_create_arch (archetype *at)
618{ 623{
619 object *op, *prev = 0, *head = 0; 624 object *op, *prev = 0, *head = 0;
620 625
621 while (at) 626 while (at)
622 { 627 {
623 op = arch_to_object (at); 628 op = at->instance ();
629
624 op->x = at->clone.x; 630 op->x = at->x;
625 op->y = at->clone.y; 631 op->y = at->y;
626 632
627 if (head) 633 if (head)
628 op->head = head, prev->more = op; 634 op->head = head, prev->more = op;
629 635
630 if (!head) 636 if (!head)
631 head = op; 637 head = op;
632 638
633 prev = op; 639 prev = op;
634 at = at->more; 640 at = (archetype *)at->more;
635 } 641 }
636 642
637 return (head); 643 return head;
638} 644}
639 645

Diff Legend

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