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.43 by root, Fri Feb 16 19:43:40 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.
… …
67archetype * 65archetype *
68find_archetype_by_object_name (const char *name) 66find_archetype_by_object_name (const char *name)
69{ 67{
70 shstr_cmp name_cmp (name); 68 shstr_cmp name_cmp (name);
71 69
72 for (archetype *at = first_archetype; at; at = at->next) 70 for_all_archetypes (at)
73 if (at->clone.name == name_cmp) 71 if (at->name == name_cmp)
74 return at; 72 return at;
75 73
76 return 0; 74 return 0;
77} 75}
78 76
… …
84archetype * 82archetype *
85find_archetype_by_object_type_name (int type, const char *name) 83find_archetype_by_object_type_name (int type, const char *name)
86{ 84{
87 shstr_cmp name_cmp (name); 85 shstr_cmp name_cmp (name);
88 86
89 for (archetype *at = first_archetype; at; at = at->next) 87 for_all_archetypes (at)
90 if (at->clone.name == name_cmp && at->clone.type == type) 88 if (at->name == name_cmp && at->type == type)
91 return at; 89 return at;
92 90
93 return 0; 91 return 0;
94} 92}
95 93
… …
101object * 99object *
102get_archetype_by_skill_name (const char *skill, int type) 100get_archetype_by_skill_name (const char *skill, int type)
103{ 101{
104 shstr_cmp skill_cmp (skill); 102 shstr_cmp skill_cmp (skill);
105 103
106 for (archetype *at = first_archetype; at; at = at->next) 104 for_all_archetypes (at)
107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 105 if (at->skill == skill_cmp && (type == -1 || type == at->type))
108 return arch_to_object (at); 106 return arch_to_object (at);
109 107
110 return 0; 108 return 0;
111} 109}
112 110
… …
118 * (eg, skills) 116 * (eg, skills)
119 */ 117 */
120archetype * 118archetype *
121get_archetype_by_type_subtype (int type, int subtype) 119get_archetype_by_type_subtype (int type, int subtype)
122{ 120{
123 for (archetype *at = first_archetype; at; at = at->next) 121 for_all_archetypes (at)
124 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))
125 return at; 123 return at;
126 124
127 return 0; 125 return 0;
128} 126}
129 127
… …
156 } 154 }
157 155
158 return create_singularity (name); 156 return create_singularity (name);
159} 157}
160 158
161 /* 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
162 * a string seperated lists of things to match, with certain keywords. 160 * a string seperated lists of things to match, with certain keywords.
163 * pl is the player (only needed to set count properly) 161 * pl is the player (only needed to set count properly)
164 * 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
165 * 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
166 * (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
167 * value means a better match. 0 means no match. 165 * value means a better match. 0 means no match.
168 * 166 *
169 * Brief outline of the procedure: 167 * Brief outline of the procedure:
170 * We take apart the name variable into the individual components. 168 * We take apart the name variable into the individual components.
171 * cases for 'all' and unpaid are pretty obvious. 169 * cases for 'all' and unpaid are pretty obvious.
172 * 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
173 * player object.) 171 * player object.)
174 * If count is 1, make a quick check on the name. 172 * If count is 1, make a quick check on the name.
175 * 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.
176 * Last, make a check on the full name. 174 * Last, make a check on the full name.
177 */ 175 */
178int 176int
179item_matched_string (object *pl, object *op, const char *name) 177item_matched_string (object *pl, object *op, const char *name)
180{ 178{
181 char *cp, local_name[MAX_BUF]; 179 char *cp, local_name[MAX_BUF];
182 int count, retval = 0; 180 int count, retval = 0;
… …
274 } 272 }
275 273
276 return 0; 274 return 0;
277} 275}
278 276
279/* 277archetype::archetype (const char *name)
280 * Initialises the internal linked list of archetypes (read from file). 278{
281 * Then the global "empty_archetype" pointer is initialised. 279 arch = this;
282 * Then the blocksview[] array is initialised. 280 this->archname = this->name = this->name_pl = name;
283 */ 281}
282
283archetype::~archetype ()
284{
285 unlink ();
286}
284 287
285void 288void
286init_archetypes (void) 289archetype::link ()
287{ /* called from add_player() and edit() */ 290{
288 if (first_archetype != NULL) /* Only do this once */ 291 ht.insert (std::make_pair (archname, this));
289 return;
290 292
291 arch_init = 1; 293 if (!archetypes.contains (this))
292 load_archetypes (); 294 archetypes.insert (this);
293 arch_init = 0;
294 empty_archetype = archetype::find ("empty_archetype");
295
296/* init_blocksview();*/
297} 295}
298 296
299/*
300 * An alternative way to init the hashtable which is slower, but _works_...
301 */
302void 297void
303init_archetable (void) 298archetype::unlink ()
304{ 299{
305 LOG (llevDebug, " Setting up archetable...\n"); 300 ht.erase (archname);
306 301
307 for (archetype *at = first_archetype; at; at = at->next) 302 if (archetypes.contains (this))
308 for (archetype *bt = at; bt; bt = bt->more) 303 archetypes.erase (this);
309 bt->hash_add ();
310
311 LOG (llevDebug, "done\n");
312} 304}
313 305
314void 306/*
315free_all_archs (void) 307 * Finds, using the hashtable, which archetype matches the given name.
308 * returns a pointer to the found archetype, otherwise NULL.
309 */
310archetype *
311archetype::find (const char *name)
316{ 312{
317 archetype *at, *next; 313 if (!name)
318 int i = 0, f = 0; 314 return 0;
319 315
320 for (at = first_archetype; at; at = next) 316 auto (i, ht.find (name));
321 { 317
322 if (at->more) 318 if (i == ht.end ())
323 next = at->more; 319 return 0;
324 else 320 else
325 next = at->next; 321 return i->second;
326
327 delete
328 at;
329
330 i++;
331 }
332
333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
334}
335
336archetype::archetype ()
337{
338 clone.arch = this;
339
340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
342}
343
344archetype::~archetype ()
345{
346 //TODO: nuke ->more's
347} 322}
348 323
349archetype * 324archetype *
350archetype::read (object_thawer &f) 325archetype::read (object_thawer &f)
351{ 326{
352 assert (f.kw == KW_object); 327 assert (f.kw == KW_object);
353 328
354 archetype *head = new archetype; 329 std::vector<archetype *> parts;
355 f.get (head->name);
356 330
357 if (!head->clone.parse_kv (f)) 331 coroapi::cede_to_tick ();
358 { 332
359 delete head; 333 for (;;)
360 return 0;
361 } 334 {
335 archetype *at = new archetype (f.get_str ());
362 336
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next (); 337 f.next ();
366 338
367 assert (f.kw == KW_object); 339#if 0
368 340 // implementing it here in the server does neither allow multiple inheritence
369 archetype *more = new archetype; 341 // nor does it cleanly "just override". it would allow use in map files, though,
370 f.get (more->name); 342 // and other resource files dynamically laoded (as opposed to being preprocessed).
371 343 // not that any of this is relevant as of yet...
372 if (!more->clone.parse_kv (f)) 344 if (f.kw == KW_inherit)
373 { 345 {
374 delete head; 346 if (archetype *at = find (f.get_str ()))
375 return 0; 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 ();
376 } 353 }
354#endif
377 355
378 assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face)); 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;
379 359
380 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 360 if (!parse_ok)
381 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 361 goto fail;
382 362
383 more->head = head; 363 loading_arch = at; // hack to tell parse_kv et al. to behave
384 more->clone.head = &head->clone; 364 at->post_load_check ();
385 prev->more = more; 365 loading_arch = 0;
386 prev->clone.more = &more->clone;
387 366
388 prev = more; 367 parts.push_back (at);
389 }
390 368
391 head->next = first_archetype; 369 if (f.kw != KW_more)
392 first_archetype = head; 370 break;
393 371
394 return head; 372 f.next ();
395}
396 373
397/* 374 if (f.kw != KW_object)
398 * Reads/parses the archetype-file, and copies into a linked list
399 * of archetype-structures.
400 */
401static bool
402first_arch_pass (object_thawer &f)
403{
404 for (;;)
405 {
406 switch (f.kw)
407 { 375 {
408 case KW_object: 376 f.parse_error ("more object");
409 if (!archetype::read (f)) 377 goto fail;
410 return false;
411 continue;
412
413 case KW_EOF:
414 return true;
415
416 default:
417 if (!f.parse_error ("archetypes file"))
418 return false;
419 } 378 }
379 }
420 380
421 f.next (); 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;
422 } 392 }
423}
424 393
425/* 394 // check that all archetypes belong to the same old object or are new
426 * Reads the archetype file once more, and links all pointers between 395 for (auto (at, parts.begin ()); at != parts.end (); ++at)
427 * archetypes. 396 {
428 */ 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;
445}
446
429void 447void
430second_arch_pass (object_thawer & thawer) 448archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
431{ 449{
432 char buf[MAX_BUF], *variable = buf, *argument, *cp; 450 ref = 0;
433 archetype *at = NULL, *other; 451 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
434
435 while (fgets (buf, MAX_BUF, thawer) != NULL)
436 {
437 if (*buf == '#')
438 continue;
439
440 if ((argument = strchr (buf, ' ')) != NULL)
441 {
442 *argument = '\0', argument++;
443 cp = argument + strlen (argument) - 1;
444 while (isspace (*cp))
445 {
446 *cp = '\0';
447 cp--;
448 }
449 }
450
451 if (!strcmp ("object", variable))
452 {
453 if ((at = archetype::find (argument)) == NULL)
454 LOG (llevError, "Warning: failed to find arch %s\n", argument);
455 }
456 else if (!strcmp ("other_arch", variable))
457 {
458 if (at != NULL && at->clone.other_arch == NULL)
459 {
460 if ((other = archetype::find (argument)) == NULL)
461 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
462 else if (at != NULL)
463 at->clone.other_arch = other;
464 }
465 }
466 else if (!strcmp ("randomitems", variable))
467 {
468 if (at)
469 {
470 treasurelist *tl = find_treasurelist (argument);
471
472 if (tl == NULL)
473 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
474 else
475 at->clone.randomitems = tl;
476 }
477 }
478 }
479} 452}
480 453
481#ifdef DEBUG
482void 454void
483check_generators (void) 455archetype::commit_load ()
484{ 456{
457 // unlink old archetypes and link in new ones */
458 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
459 {
485 archetype *at; 460 archetype *at = *p;
486 461
487 for (at = first_archetype; at != NULL; at = at->next) 462 if (archetype *old = find (at->archname))
488 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 463 old->unlink ();
489 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
490}
491#endif
492 464
493/* 465 at->link ();
494 * First initialises the archtype hash-table (init_archetable()).
495 * Reads and parses the archetype file (with the first and second-pass
496 * functions).
497 * Then initialises treasures by calling load_treasures().
498 */
499
500void
501load_archetypes (void)
502{
503 char filename[MAX_BUF];
504
505 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
506 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
507
508 {
509 object_thawer f (filename);
510
511 f.next ();
512
513 LOG (llevDebug, " arch-pass 1...\n");
514 if (!first_arch_pass (f))
515 cleanup ("errors during first arch pass are fatal");
516 LOG (llevDebug, " done\n");
517 } 466 }
518 467
519 init_archetable (); 468 postponed_arch.clear ();
520 warn_archetypes = 1;
521 469
470 // now resolve arch references
471 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
522 { 472 {
523 object_thawer f (filename); 473 arch_ptr *ap = p->first;
474 archetype *at = find (p->second);
524 475
525 LOG (llevDebug, " loading treasure...\n"); 476 if (!at)
526 load_treasures (); 477 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
527 LOG (llevDebug, " done\n"); 478
528 LOG (llevDebug, " arch-pass 2...\n"); 479 *ap = at;
529 second_arch_pass (f);
530 LOG (llevDebug, " done\n");
531#ifdef DEBUG
532 check_generators ();
533#endif
534 } 480 }
535 LOG (llevDebug, " done\n"); 481
482 postponed_arch_ref.clear ();
483
484 empty = find (shstr_empty_archetype);
536} 485}
537 486
538/* 487/*
539 * 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.
540 * This function returns NULL on failure. 489 * This function returns NULL on failure.
… …
542object * 491object *
543arch_to_object (archetype *at) 492arch_to_object (archetype *at)
544{ 493{
545 if (!at) 494 if (!at)
546 { 495 {
547 if (warn_archetypes)
548 LOG (llevError, "Couldn't find archetype.\n"); 496 LOG (llevError, "Couldn't find archetype.\n");
549
550 return NULL; 497 return 0;
551 } 498 }
552 499
553 object *op = at->clone.clone (); 500 object *op = at->clone ();
554 op->arch = at; 501 op->arch = at;
555 op->instantiate (); 502 op->instantiate ();
503
556 return op; 504 return op;
505}
506
507object *
508archetype::instance ()
509{
510 return arch_to_object (this);
557} 511}
558 512
559/* 513/*
560 * Creates an object. This function is called by get_archetype() 514 * Creates an object. This function is called by get_archetype()
561 * if it fails to find the appropriate archetype. 515 * if it fails to find the appropriate archetype.
… …
563 * an object, and never NULL. 517 * an object, and never NULL.
564 */ 518 */
565object * 519object *
566create_singularity (const char *name) 520create_singularity (const char *name)
567{ 521{
568 object *op; 522 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
523
524 if (!strcmp (name, "bug"))
525 abort ();
526
569 char buf[MAX_BUF]; 527 char buf[MAX_BUF];
528 sprintf (buf, "bug, please report (%s)", name);
570 529
571 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 530 object *op = get_archetype ("bug");
572 op = object::create ();
573 op->name = op->name_pl = buf; 531 op->name = op->name_pl = buf;
574 SET_FLAG (op, FLAG_NO_PICK); 532
575 return op; 533 return op;
576} 534}
577 535
578/* 536/*
579 * Finds which archetype matches the given name, and returns a new 537 * Finds which archetype matches the given name, and returns a new
… …
589 547
590 return arch_to_object (at); 548 return arch_to_object (at);
591} 549}
592 550
593/* 551/*
594 * Hash-function used by the arch-hashtable.
595 */
596
597unsigned long
598hasharch (const char *str, int tablesize)
599{
600 unsigned long hash = 0;
601 unsigned int i = 0;
602 const char *p;
603
604 /* use the one-at-a-time hash function, which supposedly is
605 * better than the djb2-like one used by perl5.005, but
606 * certainly is better then the bug used here before.
607 * see http://burtleburtle.net/bob/hash/doobs.html
608 */
609 for (p = str; i < MAXSTRING && *p; p++, i++)
610 {
611 hash += *p;
612 hash += hash << 10;
613 hash ^= hash >> 6;
614 }
615
616 hash += hash << 3;
617 hash ^= hash >> 11;
618 hash += hash << 15;
619
620 return hash % tablesize;
621}
622
623/*
624 * Finds, using the hashtable, which archetype matches the given name.
625 * returns a pointer to the found archetype, otherwise NULL.
626 */
627archetype *
628archetype::find (const char *name)
629{
630 if (!name)
631 return 0;
632
633 AUTODECL (i, ht.find (name));
634
635 if (i == ht.end ())
636 return 0;
637 else
638 return i->second;
639}
640
641/*
642 * Adds an archetype to the hashtable.
643 */
644void
645archetype::hash_add ()
646{
647 ht.insert (std::make_pair (name, this));
648}
649
650void
651archetype::hash_del ()
652{
653 ht.erase (name);
654}
655
656/*
657 * Returns the first archetype using the given type. 552 * Returns the first archetype using the given type.
658 * Used in treasure-generation. 553 * Used in treasure-generation.
659 */ 554 */
660archetype * 555archetype *
661type_to_archetype (int type) 556type_to_archetype (int type)
662{ 557{
663 archetype *at; 558 for_all_archetypes (at)
664 559 if (at->type == type && at->head_ () != at)
665 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
666 if (at->clone.type == type)
667 return at; 560 return at;
668 561
669 return 0; 562 return 0;
670} 563}
671 564
672/* 565/*
673 * Returns a new object copied from the first archetype matching 566 * Returns a new object copied from the first archetype matching
674 * the given type. 567 * the given type.
675 * Used in treasure-generation. 568 * Used in treasure-generation.
676 */ 569 */
677
678object * 570object *
679clone_arch (int type) 571clone_arch (int type)
680{ 572{
681 archetype *at; 573 archetype *at;
682 574
… …
684 { 576 {
685 LOG (llevError, "Can't clone archetype %d\n", type); 577 LOG (llevError, "Can't clone archetype %d\n", type);
686 return 0; 578 return 0;
687 } 579 }
688 580
689 object *op = at->clone.clone (); 581 object *op = at->clone ();
690 op->instantiate (); 582 op->instantiate ();
691 return op; 583 return op;
692} 584}
693 585
694/* 586/*
695 * member: make instance from class 587 * member: make instance from class
696 */ 588 */
697
698object * 589object *
699object_create_arch (archetype *at) 590object_create_arch (archetype *at)
700{ 591{
701 object *op, *prev = 0, *head = 0; 592 object *op, *prev = 0, *head = 0;
702 593
703 while (at) 594 while (at)
704 { 595 {
705 op = arch_to_object (at); 596 op = arch_to_object (at);
597
706 op->x = at->clone.x; 598 op->x = at->x;
707 op->y = at->clone.y; 599 op->y = at->y;
708 600
709 if (head) 601 if (head)
710 op->head = head, prev->more = op; 602 op->head = head, prev->more = op;
711 603
712 if (!head) 604 if (!head)
713 head = op; 605 head = op;
714 606
715 prev = op; 607 prev = op;
716 at = at->more; 608 at = (archetype *)at->more;
717 } 609 }
718 610
719 return (head); 611 return head;
720} 612}
721 613

Diff Legend

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