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.45 by root, Fri Apr 13 07:26:29 2007 UTC vs.
Revision 1.67 by root, Sat Jun 9 21:16:12 2007 UTC

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

Diff Legend

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