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.70 by root, Tue Oct 16 00:30:24 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
41archetype *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
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 if (loading_arch && !strcmp (&loading_arch->archname, name))
334} 337 return loading_arch;
335 338
336archetype::archetype () 339 archetype *at = find (name);
337{
338 clone.arch = this;
339 340
340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 341 if (!at)
341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 342 {
342} 343 at = new archetype (name);
344 at->link ();
345 }
343 346
344archetype::~archetype () 347 return at;
345{
346 //TODO: nuke ->more's
347} 348}
348 349
349archetype * 350archetype *
350archetype::read (object_thawer &f) 351archetype::read (object_thawer &f)
351{ 352{
352 assert (f.kw == KW_object); 353 assert (f.kw == KW_object);
353 354
354 archetype *head = new archetype; 355 std::vector<archetype *> parts;
355 f.get (head->name);
356 356
357 if (!head->clone.parse_kv (f)) 357 coroapi::cede_to_tick_every (10);
358 { 358
359 delete head; 359 for (;;)
360 return 0;
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 loading_arch = at; // hack to tell parse_kv et al. to behave
379 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 388 bool parse_ok = at->parse_kv (f);
389 loading_arch = 0;
380 390
381 more->head = head; 391 if (!parse_ok)
382 more->clone.head = &head->clone; 392 goto fail;
383 prev->more = more;
384 prev->clone.more = &more->clone;
385 393
386 prev = more; 394 loading_arch = at; // hack to tell parse_kv et al. to behave
387 } 395 at->post_load_check ();
396 loading_arch = 0;
388 397
389 head->next = first_archetype; 398 parts.push_back (at);
390 first_archetype = head;
391 399
392 return head; 400 if (f.kw != KW_more)
393} 401 break;
394 402
395/* 403 f.next ();
396 * Reads/parses the archetype-file, and copies into a linked list 404
397 * of archetype-structures. 405 if (f.kw != KW_object)
398 */
399static bool
400first_arch_pass (object_thawer &f)
401{
402 for (;;)
403 {
404 switch (f.kw)
405 { 406 {
406 case KW_object: 407 f.parse_error ("more object");
407 if (!archetype::read (f)) 408 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 } 409 }
410 }
418 411
419 f.next (); 412 {
413 auto (at, parts.begin ());
414
415 archetype *new_head = parts.front ();
416 archetype *old_head = find (new_head->archname);
417
418 if (old_head && !old_head->is_head ())
419 {
420 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
421 &new_head->archname, &old_head->archname);
422 goto fail;
420 } 423 }
421}
422 424
425 // check that all archetypes belong to the same old object or are new
426 for (auto (at, parts.begin ()); at != parts.end (); ++at)
427 {
428 archetype *new_part = *at;
429 archetype *old_part = find (new_part->archname);
430
431 if (old_part && old_part->head_ () != old_head)
432 {
433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
434 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
435 goto fail;
436 }
437 }
438
439 // deactivate existing archetype
440 for (archetype *at = old_head; at; at = (archetype *)at->more)
441 at->unlink ();
442
443 // assemble new chain
444 new_head->min_x = new_head->max_x = new_head->x;
445 new_head->min_y = new_head->max_y = new_head->y;
446
447 archetype *less = new_head;
448 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
449 {
450 archetype *at = *p;
451
452 // some flags get inherited formt he head (probably a lot more)
453 // doing it here doesn't feel too cozy, but it allows code
454 // to ignore head checks for these flags, which saves time
455 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
456 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
457 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
458 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
459
460 if (at->x < new_head->min_x) new_head->min_x = at->x;
461 if (at->y < new_head->min_y) new_head->min_y = at->y;
462 if (at->x > new_head->max_x) new_head->max_x = at->x;
463 if (at->y > new_head->max_y) new_head->max_y = at->y;
464
465 at->head = new_head;
466 less->more = at;
467 less = at;
468 }
469
470 // now activate it
471 for (auto (p, parts.begin ()); p != parts.end (); ++p)
472 {
473 archetype *at = *p;
474 at->stub = false;
475 at->link ();
476 }
477
478 return new_head;
479 }
480
481fail:
482 for (auto (p, parts.begin ()); p != parts.end (); ++p)
483 (*p)->destroy (true);
484
485 return 0;
486}
487
423/* 488/*
424 * Reads the archetype file once more, and links all pointers between 489 * Initialize global archtype pointers:
425 * archetypes.
426 */ 490 */
427void 491void
428second_arch_pass (object_thawer & thawer) 492init_archetype_pointers ()
429{ 493{
430 char buf[MAX_BUF], *variable = buf, *argument, *cp; 494 ring_arch = archetype::find ("ring");
431 archetype *at = NULL, *other; 495 amulet_arch = archetype::find ("amulet");
432 496 staff_arch = archetype::find ("staff");
433 while (fgets (buf, MAX_BUF, thawer) != NULL) 497 crown_arch = archetype::find ("crown");
434 { 498 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} 499}
519 500
520/* 501/*
521 * Creates and returns a new object which is a copy of the given archetype. 502 * Creates and returns a new object which is a copy of the given archetype.
522 * This function returns NULL on failure. 503 * This function returns NULL on failure.
… …
524object * 505object *
525arch_to_object (archetype *at) 506arch_to_object (archetype *at)
526{ 507{
527 if (!at) 508 if (!at)
528 { 509 {
529 if (warn_archetypes)
530 LOG (llevError, "Couldn't find archetype.\n"); 510 LOG (llevError, "Couldn't find archetype.\n");
531
532 return NULL; 511 return 0;
533 } 512 }
534 513
535 object *op = at->clone.clone (); 514 object *op = at->clone ();
536 op->arch = at; 515 op->arch = at;
537 op->instantiate (); 516 op->instantiate ();
517
538 return op; 518 return op;
519}
520
521object *
522archetype::instance ()
523{
524 return arch_to_object (this);
539} 525}
540 526
541/* 527/*
542 * Creates an object. This function is called by get_archetype() 528 * Creates an object. This function is called by get_archetype()
543 * if it fails to find the appropriate archetype. 529 * if it fails to find the appropriate archetype.
… …
545 * an object, and never NULL. 531 * an object, and never NULL.
546 */ 532 */
547object * 533object *
548create_singularity (const char *name) 534create_singularity (const char *name)
549{ 535{
550 object *op; 536 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
537
538 if (!strcmp (name, "bug"))
539 abort ();
540
551 char buf[MAX_BUF]; 541 char buf[MAX_BUF];
542 sprintf (buf, "bug, please report (%s)", name);
552 543
553 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 544 object *op = get_archetype ("bug");
554 op = object::create ();
555 op->name = op->name_pl = buf; 545 op->name = op->name_pl = buf;
556 SET_FLAG (op, FLAG_NO_PICK); 546
557 return op; 547 return op;
558} 548}
559 549
560/* 550/*
561 * Finds which archetype matches the given name, and returns a new 551 * Finds which archetype matches the given name, and returns a new
… …
571 561
572 return arch_to_object (at); 562 return arch_to_object (at);
573} 563}
574 564
575/* 565/*
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. 566 * Returns the first archetype using the given type.
640 * Used in treasure-generation. 567 * Used in treasure-generation.
641 */ 568 */
642archetype * 569archetype *
643type_to_archetype (int type) 570type_to_archetype (int type)
644{ 571{
645 archetype *at; 572 for_all_archetypes (at)
646 573 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; 574 return at;
650 575
651 return 0; 576 return 0;
652} 577}
653 578
654/* 579/*
655 * Returns a new object copied from the first archetype matching 580 * Returns a new object copied from the first archetype matching
656 * the given type. 581 * the given type.
657 * Used in treasure-generation. 582 * Used in treasure-generation.
658 */ 583 */
659
660object * 584object *
661clone_arch (int type) 585clone_arch (int type)
662{ 586{
663 archetype *at; 587 archetype *at;
664 588
… …
666 { 590 {
667 LOG (llevError, "Can't clone archetype %d\n", type); 591 LOG (llevError, "Can't clone archetype %d\n", type);
668 return 0; 592 return 0;
669 } 593 }
670 594
671 object *op = at->clone.clone (); 595 object *op = at->clone ();
672 op->instantiate (); 596 op->instantiate ();
673 return op; 597 return op;
674} 598}
675 599
676/* 600/*
677 * member: make instance from class 601 * member: make instance from class
678 */ 602 */
679
680object * 603object *
681object_create_arch (archetype *at) 604object_create_arch (archetype *at)
682{ 605{
683 object *op, *prev = 0, *head = 0; 606 object *op, *prev = 0, *head = 0;
684 607
685 while (at) 608 while (at)
686 { 609 {
687 op = arch_to_object (at); 610 op = arch_to_object (at);
611
688 op->x = at->clone.x; 612 op->x = at->x;
689 op->y = at->clone.y; 613 op->y = at->y;
690 614
691 if (head) 615 if (head)
692 op->head = head, prev->more = op; 616 op->head = head, prev->more = op;
693 617
694 if (!head) 618 if (!head)
695 head = op; 619 head = op;
696 620
697 prev = op; 621 prev = op;
698 at = at->more; 622 at = (archetype *)at->more;
699 } 623 }
700 624
701 return (head); 625 return head;
702} 626}
703 627

Diff Legend

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