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.68 by root, Sun Jul 1 05:00:17 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
28#include <funcpoint.h> 27#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
34int arch_init; /* True if doing arch initialization */
35 32
36/* The naming of these functions is really poor - they are all 33/* The naming of these functions is really poor - they are all
37 * pretty much named '.._arch_...', but they may more may not 34 * pretty much named '.._arch_...', but they may more may not
38 * return archetypes. Some make the arch_to_object call, and thus 35 * return archetypes. Some make the arch_to_object call, and thus
39 * return an object. Perhaps those should be called 'archob' functions 36 * return an object. Perhaps those should be called 'archob' functions
40 * to denote they return an object derived from the archetype. 37 * to denote they return an object derived from the archetype.
41 * MSW 2003-04-29 38 * MSW 2003-04-29
42 */ 39 */
40
41bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43 42
44// the hashtable 43// the hashtable
45typedef std::tr1::unordered_map 44typedef std::tr1::unordered_map
46 < 45 <
47 const char *, 46 const char *,
… …
50 str_equal, 49 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 50 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 51 > HT;
53 52
54static HT ht (5000); 53static HT ht (5000);
54archvec archetypes;
55 55
56/** 56/**
57 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 58 * 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. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
67archetype * 67archetype *
68find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
69{ 69{
70 shstr_cmp name_cmp (name); 70 shstr_cmp name_cmp (name);
71 71
72 for (archetype *at = first_archetype; at; at = at->next) 72 for_all_archetypes (at)
73 if (at->clone.name == name_cmp) 73 if (at->name == name_cmp)
74 return at; 74 return at;
75 75
76 return 0; 76 return 0;
77} 77}
78 78
… …
84archetype * 84archetype *
85find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
86{ 86{
87 shstr_cmp name_cmp (name); 87 shstr_cmp name_cmp (name);
88 88
89 for (archetype *at = first_archetype; at; at = at->next) 89 for_all_archetypes (at)
90 if (at->clone.name == name_cmp && at->clone.type == type) 90 if (at->name == name_cmp && at->type == type)
91 return at; 91 return at;
92 92
93 return 0; 93 return 0;
94} 94}
95 95
… …
101object * 101object *
102get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
103{ 103{
104 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
105 105
106 for (archetype *at = first_archetype; at; at = at->next) 106 for_all_archetypes (at)
107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
108 return arch_to_object (at); 108 return arch_to_object (at);
109 109
110 return 0; 110 return 0;
111} 111}
112 112
… …
118 * (eg, skills) 118 * (eg, skills)
119 */ 119 */
120archetype * 120archetype *
121get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
122{ 122{
123 for (archetype *at = first_archetype; at; at = at->next) 123 for_all_archetypes (at)
124 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))
125 return at; 125 return at;
126 126
127 return 0; 127 return 0;
128} 128}
129 129
… …
156 } 156 }
157 157
158 return create_singularity (name); 158 return create_singularity (name);
159} 159}
160 160
161 /* This is a subset of the parse_id command. Basically, name can be 161/* 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. 162 * a string seperated lists of things to match, with certain keywords.
163 * pl is the player (only needed to set count properly) 163 * pl is the player (only needed to set count properly)
164 * op is the item we are trying to match. Calling function takes care 164 * 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 165 * 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 166 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
167 * value means a better match. 0 means no match. 167 * value means a better match. 0 means no match.
168 * 168 *
169 * Brief outline of the procedure: 169 * Brief outline of the procedure:
170 * We take apart the name variable into the individual components. 170 * We take apart the name variable into the individual components.
171 * cases for 'all' and unpaid are pretty obvious. 171 * cases for 'all' and unpaid are pretty obvious.
172 * Next, we check for a count (either specified in name, or in the 172 * Next, we check for a count (either specified in name, or in the
173 * player object.) 173 * player object.)
174 * If count is 1, make a quick check on the name. 174 * 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. 175 * IF count is >1, we need to make plural name. Return if match.
176 * Last, make a check on the full name. 176 * Last, make a check on the full name.
177 */ 177 */
178int 178int
179item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
180{ 180{
181 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
182 int count, retval = 0; 182 int count, retval = 0;
… …
274 } 274 }
275 275
276 return 0; 276 return 0;
277} 277}
278 278
279/* 279archetype::archetype (const char *name)
280 * Initialises the internal linked list of archetypes (read from file). 280{
281 * Then the global "empty_archetype" pointer is initialised. 281 stub = true;
282 * Then the blocksview[] array is initialised. 282 arch = this;
283 */ 283 this->archname = this->name = this->name_pl = name;
284}
285
286archetype::~archetype ()
287{
288 unlink ();
289}
284 290
285void 291void
286init_archetypes (void) 292archetype::link ()
287{ /* called from add_player() and edit() */ 293{
288 if (first_archetype != NULL) /* Only do this once */ 294 ht.insert (std::make_pair (archname, this));
289 return;
290 295
291 arch_init = 1; 296 if (!archetypes.contains (this))
292 load_archetypes (); 297 archetypes.insert (this);
293 arch_init = 0;
294 empty_archetype = archetype::find ("empty_archetype");
295
296/* init_blocksview();*/
297} 298}
298 299
299/*
300 * An alternative way to init the hashtable which is slower, but _works_...
301 */
302void 300void
303init_archetable (void) 301archetype::unlink ()
304{ 302{
305 LOG (llevDebug, " Setting up archetable...\n"); 303 ht.erase (archname);
306 304 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
307 for (archetype *at = first_archetype; at; at = at->next) 305 if (archetypes.contains (this))
308 for (archetype *bt = at; bt; bt = bt->more) 306 archetypes.erase (this);
309 bt->hash_add ();
310
311 LOG (llevDebug, "done\n");
312} 307}
313 308
314void 309/*
315free_all_archs (void) 310 * Finds, using the hashtable, which archetype matches the given name.
311 * returns a pointer to the found archetype, otherwise NULL.
312 */
313archetype *
314archetype::find (const char *name)
316{ 315{
317 archetype *at, *next; 316 if (!name)
318 int i = 0, f = 0; 317 return 0;
319 318
320 for (at = first_archetype; at; at = next) 319 auto (i, ht.find (name));
321 { 320
322 if (at->more) 321 if (i == ht.end ())
323 next = at->more; 322 return 0;
324 else 323 else
325 next = at->next; 324 return i->second;
325}
326 326
327 delete 327archetype *
328 at; 328archetype::get (const char *name)
329 329{
330 i++; 330 if (!name)
331 } 331 {
332 LOG (llevError, "null archetype requested\n");
333 name = "(null)";
334 }
332 335
333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 336 archetype *at = find (name);
334}
335 337
336archetype::archetype () 338 if (!at)
337{ 339 {
338 clone.arch = this; 340 at = new archetype (name);
341 at->link ();
342 }
339 343
340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 344 return at;
341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
342}
343
344archetype::~archetype ()
345{
346 //TODO: nuke ->more's
347} 345}
348 346
349archetype * 347archetype *
350archetype::read (object_thawer &f) 348archetype::read (object_thawer &f)
351{ 349{
352 assert (f.kw == KW_object); 350 assert (f.kw == KW_object);
353 351
354 archetype *head = new archetype; 352 loading_arch = true; // hack to tell parse_kv et al. to behave
355 f.get (head->name);
356 353
357 if (!head->clone.parse_kv (f)) 354 std::vector<archetype *> parts;
358 { 355
359 delete head; 356 coroapi::cede_to_tick_every (10);
360 return 0; 357
358 for (;;)
361 } 359 {
360 // the archetype might have been referenced earlier
361 // so try to find an existing stub archetype first
362 archetype *at = find (f.get_str ());
362 363
363 for (archetype *prev = head; f.kw == KW_more; ) 364 if (!at || !at->stub)
364 { 365 at = new archetype (f.get_str ());
366
365 f.next (); 367 f.next ();
366 368
367 assert (f.kw == KW_object); 369#if 0
368 370 // implementing it here in the server does neither allow multiple inheritence
369 archetype *more = new archetype; 371 // nor does it cleanly "just override". it would allow use in map files, though,
370 f.get (more->name); 372 // and other resource files dynamically laoded (as opposed to being preprocessed).
371 373 // not that any of this is relevant as of yet...
372 if (!more->clone.parse_kv (f)) 374 if (f.kw == KW_inherit)
373 { 375 {
374 delete head; 376 if (archetype *at = find (f.get_str ()))
375 return 0; 377 *op = at->clone;
378 else
379 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
380 &at->archname, f.get_str ());
381
382 f.next ();
376 } 383 }
384#endif
377 385
378 assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face)); 386 if (!at->parse_kv (f))
387 goto fail;
379 388
380 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 389 at->post_load_check ();
381 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
382 390
383 more->head = head; 391 parts.push_back (at);
384 more->clone.head = &head->clone;
385 prev->more = more;
386 prev->clone.more = &more->clone;
387 392
388 prev = more; 393 if (f.kw != KW_more)
389 } 394 break;
390 395
391 head->next = first_archetype; 396 f.next ();
392 first_archetype = head;
393 397
394 return head; 398 if (f.kw != KW_object)
395}
396
397/*
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 { 399 {
408 case KW_object: 400 f.parse_error ("more object");
409 if (!archetype::read (f)) 401 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 } 402 }
403 }
420 404
421 f.next (); 405 loading_arch = false;
406
407 {
408 auto (at, parts.begin ());
409
410 archetype *new_head = parts.front ();
411 archetype *old_head = find (new_head->archname);
412
413 if (old_head && !old_head->is_head ())
414 {
415 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
416 &new_head->archname, &old_head->archname);
417 goto fail;
422 } 418 }
423}
424 419
420 // check that all archetypes belong to the same old object or are new
421 for (auto (at, parts.begin ()); at != parts.end (); ++at)
422 {
423 archetype *new_part = *at;
424 archetype *old_part = find (new_part->archname);
425
426 if (old_part && old_part->head_ () != old_head)
427 {
428 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
429 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
430 goto fail;
431 }
432 }
433
434 // deactivate existing archetype
435 for (archetype *at = old_head; at; at = (archetype *)at->more)
436 at->unlink ();
437
438 // assemble new chain
439 new_head->min_x = new_head->max_x = new_head->x;
440 new_head->min_y = new_head->max_y = new_head->y;
441
442 archetype *less = new_head;
443 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
444 {
445 archetype *at = *p;
446
447 // some flags get inherited formt he head (probably a lot more)
448 // doing it here doesn't feel too cozy, but it allows code
449 // to ignore head checks for these flags, which saves time
450 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
451 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
452 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
453 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
454
455 if (at->x < new_head->min_x) new_head->min_x = at->x;
456 if (at->y < new_head->min_y) new_head->min_y = at->y;
457 if (at->x > new_head->max_x) new_head->max_x = at->x;
458 if (at->y > new_head->max_y) new_head->max_y = at->y;
459
460 at->head = new_head;
461 less->more = at;
462 less = at;
463 }
464
465 // now activate it
466 for (auto (p, parts.begin ()); p != parts.end (); ++p)
467 {
468 archetype *at = *p;
469 at->stub = false;
470 at->link ();
471 }
472
473 return new_head;
474 }
475
476fail:
477 for (auto (p, parts.begin ()); p != parts.end (); ++p)
478 (*p)->destroy (true);
479
480 loading_arch = false;
481 return 0;
482}
483
425/* 484/*
426 * Reads the archetype file once more, and links all pointers between 485 * Initialize global archtype pointers:
427 * archetypes.
428 */ 486 */
429void 487void
430second_arch_pass (object_thawer & thawer) 488init_archetype_pointers ()
431{ 489{
432 char buf[MAX_BUF], *variable = buf, *argument, *cp; 490 ring_arch = archetype::find ("ring");
433 archetype *at = NULL, *other; 491 amulet_arch = archetype::find ("amulet");
434 492 staff_arch = archetype::find ("staff");
435 while (fgets (buf, MAX_BUF, thawer) != NULL) 493 crown_arch = archetype::find ("crown");
436 { 494 empty_archetype = archetype::find ("empty_archetype");
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}
480
481#ifdef DEBUG
482void
483check_generators (void)
484{
485 archetype *at;
486
487 for (at = first_archetype; at != NULL; at = at->next)
488 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
489 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
490}
491#endif
492
493/*
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 }
518
519 init_archetable ();
520 warn_archetypes = 1;
521
522 {
523 object_thawer f (filename);
524
525 LOG (llevDebug, " loading treasure...\n");
526 load_treasures ();
527 LOG (llevDebug, " done\n");
528 LOG (llevDebug, " arch-pass 2...\n");
529 second_arch_pass (f);
530 LOG (llevDebug, " done\n");
531#ifdef DEBUG
532 check_generators ();
533#endif
534 }
535 LOG (llevDebug, " done\n");
536} 495}
537 496
538/* 497/*
539 * Creates and returns a new object which is a copy of the given archetype. 498 * Creates and returns a new object which is a copy of the given archetype.
540 * This function returns NULL on failure. 499 * This function returns NULL on failure.
… …
542object * 501object *
543arch_to_object (archetype *at) 502arch_to_object (archetype *at)
544{ 503{
545 if (!at) 504 if (!at)
546 { 505 {
547 if (warn_archetypes)
548 LOG (llevError, "Couldn't find archetype.\n"); 506 LOG (llevError, "Couldn't find archetype.\n");
549
550 return NULL; 507 return 0;
551 } 508 }
552 509
553 object *op = at->clone.clone (); 510 object *op = at->clone ();
554 op->arch = at; 511 op->arch = at;
555 op->instantiate (); 512 op->instantiate ();
513
556 return op; 514 return op;
557} 515}
558 516
559/* 517/*
560 * Creates an object. This function is called by get_archetype() 518 * Creates an object. This function is called by get_archetype()
… …
563 * an object, and never NULL. 521 * an object, and never NULL.
564 */ 522 */
565object * 523object *
566create_singularity (const char *name) 524create_singularity (const char *name)
567{ 525{
568 object *op; 526 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
527
528 if (!strcmp (name, "bug"))
529 abort ();
530
569 char buf[MAX_BUF]; 531 char buf[MAX_BUF];
532 sprintf (buf, "bug, please report (%s)", name);
570 533
571 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 534 object *op = get_archetype ("bug");
572 op = object::create ();
573 op->name = op->name_pl = buf; 535 op->name = op->name_pl = buf;
574 SET_FLAG (op, FLAG_NO_PICK); 536
575 return op; 537 return op;
576} 538}
577 539
578/* 540/*
579 * Finds which archetype matches the given name, and returns a new 541 * Finds which archetype matches the given name, and returns a new
… …
589 551
590 return arch_to_object (at); 552 return arch_to_object (at);
591} 553}
592 554
593/* 555/*
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. 556 * Returns the first archetype using the given type.
658 * Used in treasure-generation. 557 * Used in treasure-generation.
659 */ 558 */
660archetype * 559archetype *
661type_to_archetype (int type) 560type_to_archetype (int type)
662{ 561{
663 archetype *at; 562 for_all_archetypes (at)
664 563 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; 564 return at;
668 565
669 return 0; 566 return 0;
670} 567}
671 568
672/* 569/*
673 * Returns a new object copied from the first archetype matching 570 * Returns a new object copied from the first archetype matching
674 * the given type. 571 * the given type.
675 * Used in treasure-generation. 572 * Used in treasure-generation.
676 */ 573 */
677
678object * 574object *
679clone_arch (int type) 575clone_arch (int type)
680{ 576{
681 archetype *at; 577 archetype *at;
682 578
… …
684 { 580 {
685 LOG (llevError, "Can't clone archetype %d\n", type); 581 LOG (llevError, "Can't clone archetype %d\n", type);
686 return 0; 582 return 0;
687 } 583 }
688 584
689 object *op = at->clone.clone (); 585 object *op = at->clone ();
690 op->instantiate (); 586 op->instantiate ();
691 return op; 587 return op;
692} 588}
693 589
694/* 590/*
695 * member: make instance from class 591 * member: make instance from class
696 */ 592 */
697
698object * 593object *
699object_create_arch (archetype *at) 594object_create_arch (archetype *at)
700{ 595{
701 object *op, *prev = 0, *head = 0; 596 object *op, *prev = 0, *head = 0;
702 597
703 while (at) 598 while (at)
704 { 599 {
705 op = arch_to_object (at); 600 op = arch_to_object (at);
601
706 op->x = at->clone.x; 602 op->x = at->x;
707 op->y = at->clone.y; 603 op->y = at->y;
708 604
709 if (head) 605 if (head)
710 op->head = head, prev->more = op; 606 op->head = head, prev->more = op;
711 607
712 if (!head) 608 if (!head)
713 head = op; 609 head = op;
714 610
715 prev = op; 611 prev = op;
716 at = at->more; 612 at = (archetype *)at->more;
717 } 613 }
718 614
719 return (head); 615 return head;
720} 616}
721 617

Diff Legend

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