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.14 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.25 by root, Tue Nov 7 16:30:54 2006 UTC

1/*
2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.14 2006/09/08 17:14:07 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
28 23
29#include <cassert> 24#include <cassert>
30 25
31#include <tr1/unordered_map> 26#include <tr1/unordered_map>
… …
36#include <loader.h> 31#include <loader.h>
37 32
38/* IF set, does a little timing on the archetype load. */ 33/* IF set, does a little timing on the archetype load. */
39#define TIME_ARCH_LOAD 0 34#define TIME_ARCH_LOAD 0
40 35
41static void add_arch (archetype * at); 36static void add_arch (archetype *at);
42 37
43static archetype *arch_table[ARCHTABLE]; 38static archetype *arch_table[ARCHTABLE];
44int arch_cmp = 0; /* How many strcmp's */ 39int arch_cmp = 0; /* How many strcmp's */
45int arch_search = 0; /* How many searches */ 40int arch_search = 0; /* How many searches */
46int arch_init; /* True if doing arch initialization */ 41int arch_init; /* True if doing arch initialization */
… …
53 * MSW 2003-04-29 48 * MSW 2003-04-29
54 */ 49 */
55 50
56#if USE_UNORDERED_MAP 51#if USE_UNORDERED_MAP
57// the hashtable 52// the hashtable
58typedef std::tr1::unordered_map<size_t, archetype *> HT; 53typedef std::tr1::unordered_map
54 <
55 std::size_t,
56 archetype *,
57 std::hash<size_t>,
58 std::equal_to<size_t>,
59 slice_allocator< std::pair<const std::size_t, archetype *> >
60 true,
61 > HT;
59 62
60static HT ht; 63static HT ht;
61#endif 64#endif
62 65
63/** 66/**
… …
165 * but it otherwise had a big memory leak. 168 * but it otherwise had a big memory leak.
166 */ 169 */
167object * 170object *
168get_archetype_by_object_name (const char *name) 171get_archetype_by_object_name (const char *name)
169{ 172{
170 archetype * 173 archetype *at;
171 at;
172 char
173 tmpname[MAX_BUF]; 174 char tmpname[MAX_BUF];
174 int 175 int i;
175 i;
176 176
177 strncpy (tmpname, name, MAX_BUF - 1); 177 assign (tmpname, name);
178 tmpname[MAX_BUF - 1] = 0; 178
179 for (i = strlen (tmpname); i > 0; i--) 179 for (i = strlen (tmpname); i > 0; i--)
180 { 180 {
181 tmpname[i] = 0; 181 tmpname[i] = 0;
182 at = find_archetype_by_object_name (tmpname); 182 at = find_archetype_by_object_name (tmpname);
183
183 if (at != NULL) 184 if (at != NULL)
184 {
185 return arch_to_object (at); 185 return arch_to_object (at);
186 }
187 } 186 }
187
188 return create_singularity (name); 188 return create_singularity (name);
189} 189}
190 190
191 /* This is a subset of the parse_id command. Basically, name can be 191 /* This is a subset of the parse_id command. Basically, name can be
192 * a string seperated lists of things to match, with certain keywords. 192 * a string seperated lists of things to match, with certain keywords.
… …
204 * If count is 1, make a quick check on the name. 204 * If count is 1, make a quick check on the name.
205 * IF count is >1, we need to make plural name. Return if match. 205 * IF count is >1, we need to make plural name. Return if match.
206 * Last, make a check on the full name. 206 * Last, make a check on the full name.
207 */ 207 */
208int 208int
209item_matched_string (object * pl, object * op, const char *name) 209item_matched_string (object *pl, object *op, const char *name)
210{ 210{
211 char *
212 cp,
213 local_name[MAX_BUF]; 211 char *cp, local_name[MAX_BUF];
214 int 212 int count, retval = 0;
215 count, 213
216 retval = 0;
217 strcpy (local_name, name); /* strtok is destructive to name */ 214 strcpy (local_name, name); /* strtok is destructive to name */
218 215
219 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
220 { 217 {
221 while (cp[0] == ' ') 218 while (cp[0] == ' ')
… …
272 retval = 15; 269 retval = 15;
273 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 270 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
274 retval = 14; 271 retval = 14;
275 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 272 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
276 retval = 14; 273 retval = 14;
277
278 /* Do substring checks, so things like 'Str+1' will match. 274 /* Do substring checks, so things like 'Str+1' will match.
279 * retval of these should perhaps be lower - they are lower 275 * retval of these should perhaps be lower - they are lower
280 * then the specific strcasecmp aboves, but still higher than 276 * then the specific strcasecmp aboves, but still higher than
281 * some other match criteria. 277 * some other match criteria.
282 */ 278 */
… …
284 retval = 12; 280 retval = 12;
285 else if (strstr (query_base_name (op, 0), cp)) 281 else if (strstr (query_base_name (op, 0), cp))
286 retval = 12; 282 retval = 12;
287 else if (strstr (query_short_name (op), cp)) 283 else if (strstr (query_short_name (op), cp))
288 retval = 12; 284 retval = 12;
289
290 /* Check against plural/non plural based on count. */ 285 /* Check against plural/non plural based on count. */
291 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 286 else if (count > 1 && !strcasecmp (cp, op->name_pl))
292 {
293 retval = 6; 287 retval = 6;
294 }
295 else if (count == 1 && !strcasecmp (op->name, cp)) 288 else if (count == 1 && !strcasecmp (op->name, cp))
296 {
297 retval = 6; 289 retval = 6;
298 }
299 /* base name matched - not bad */ 290 /* base name matched - not bad */
300 else if (strcasecmp (cp, op->name) == 0 && !count) 291 else if (strcasecmp (cp, op->name) == 0 && !count)
301 retval = 4; 292 retval = 4;
302 /* Check for partial custom name, but give a real low priority */ 293 /* Check for partial custom name, but give a real low priority */
303 else if (op->custom_name && strstr (op->custom_name, cp)) 294 else if (op->custom_name && strstr (op->custom_name, cp))
… …
305 296
306 if (retval) 297 if (retval)
307 { 298 {
308 if (pl->type == PLAYER) 299 if (pl->type == PLAYER)
309 pl->contr->count = count; 300 pl->contr->count = count;
301
310 return retval; 302 return retval;
311 } 303 }
312 } 304 }
305
313 return 0; 306 return 0;
314} 307}
315 308
316/* 309/*
317 * Initialises the internal linked list of archetypes (read from file). 310 * Initialises the internal linked list of archetypes (read from file).
… …
322void 315void
323init_archetypes (void) 316init_archetypes (void)
324{ /* called from add_player() and edit() */ 317{ /* called from add_player() and edit() */
325 if (first_archetype != NULL) /* Only do this once */ 318 if (first_archetype != NULL) /* Only do this once */
326 return; 319 return;
320
327 arch_init = 1; 321 arch_init = 1;
328 load_archetypes (); 322 load_archetypes ();
329 arch_init = 0; 323 arch_init = 0;
330 empty_archetype = find_archetype ("empty_archetype"); 324 empty_archetype = archetype::find ("empty_archetype");
325
331/* init_blocksview();*/ 326/* init_blocksview();*/
332} 327}
333 328
334/* 329/*
335 * Stores debug-information about how efficient the hashtable 330 * Stores debug-information about how efficient the hashtable
336 * used for archetypes has been in the static errmsg array. 331 * used for archetypes has been in the static errmsg array.
337 */ 332 */
338 333
339void 334void
340arch_info (object * op) 335arch_info (object *op)
341{ 336{
342 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
343 new_draw_info (NDI_BLACK, 0, op, errmsg); 338 new_draw_info (NDI_BLACK, 0, op, errmsg);
344} 339}
345 340
… …
368 add_arch (at); 363 add_arch (at);
369 364
370 LOG (llevDebug, "done\n"); 365 LOG (llevDebug, "done\n");
371} 366}
372 367
373/*
374 * Dumps an archetype to debug-level output.
375 */
376
377void
378dump_arch (archetype * at)
379{
380 dump_object (&at->clone);
381}
382
383/*
384 * Dumps _all_ archetypes to debug-level output.
385 * If you run crossfire with debug, and enter DM-mode, you can trigger
386 * this with the O key.
387 */
388
389void
390dump_all_archetypes (void)
391{
392 archetype *
393 at;
394 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
395 {
396 dump_arch (at);
397 fprintf (logfile, "%s\n", errmsg);
398 }
399}
400
401void 368void
402free_all_archs (void) 369free_all_archs (void)
403{ 370{
404 archetype * 371 archetype *at, *next;
405 at, *
406 next;
407 int
408 i = 0, f = 0; 372 int i = 0, f = 0;
409 373
410 for (at = first_archetype; at != NULL; at = next) 374 for (at = first_archetype; at != NULL; at = next)
411 { 375 {
412 if (at->more) 376 if (at->more)
413 next = at->more; 377 next = at->more;
414 else 378 else
415 next = at->next; 379 next = at->next;
416 380
417 delete 381 delete
418 at; 382 at;
383
419 i++; 384 i++;
420 } 385 }
421 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 386 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422} 387}
423 388
424archetype::archetype () 389archetype::archetype ()
425{ 390{
426 clear_object (&clone); /* to initial state other also */ 391 clear_object (&clone); /* to initial state other also */
427 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 392 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
428 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
429} 394}
430 395
431archetype::~archetype () 396archetype::~archetype ()
432{ 397{
433} 398}
… …
454 */ 419 */
455 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info)); 420 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
456 421
457 switch (i) 422 switch (i)
458 { 423 {
459 case LL_NORMAL: /* A new archetype, just link it with the previous */ 424 case LL_NORMAL: /* A new archetype, just link it with the previous */
460 if (last_more != NULL) 425 if (last_more != NULL)
461 last_more->next = at; 426 last_more->next = at;
462 if (head != NULL) 427 if (head != NULL)
463 head->next = at; 428 head->next = at;
464 head = last_more = at; 429 head = last_more = at;
465#if 0 430#if 0
466 if (!op->type) 431 if (!op->type)
467 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name); 432 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
468#endif 433#endif
469 at->tail_x = 0; 434 at->tail_x = 0;
470 at->tail_y = 0; 435 at->tail_y = 0;
471 break; 436 break;
472 437
473 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 438 case LL_MORE: /* Another part of the previous archetype, link it correctly */
474 439
475 at->head = head; 440 at->head = head;
476 at->clone.head = &head->clone; 441 at->clone.head = &head->clone;
477 if (last_more != NULL) 442 if (last_more != NULL)
478 { 443 {
479 last_more->more = at; 444 last_more->more = at;
480 last_more->clone.more = &at->clone; 445 last_more->clone.more = &at->clone;
481 } 446 }
482 last_more = at; 447 last_more = at;
483 448
484 /* If this multipart image is still composed of individual small 449 /* If this multipart image is still composed of individual small
485 * images, don't set the tail_.. values. We can't use them anyways, 450 * images, don't set the tail_.. values. We can't use them anyways,
486 * and setting these to zero makes the map sending to the client much 451 * and setting these to zero makes the map sending to the client much
487 * easier as just looking at the head, we know what to do. 452 * easier as just looking at the head, we know what to do.
488 */ 453 */
489 if (at->clone.face != head->clone.face) 454 if (at->clone.face != head->clone.face)
490 { 455 {
491 head->tail_x = 0; 456 head->tail_x = 0;
492 head->tail_y = 0; 457 head->tail_y = 0;
493 } 458 }
494 else 459 else
495 { 460 {
496 if (at->clone.x > head->tail_x) 461 if (at->clone.x > head->tail_x)
497 head->tail_x = at->clone.x; 462 head->tail_x = at->clone.x;
498 if (at->clone.y > head->tail_y) 463 if (at->clone.y > head->tail_y)
499 head->tail_y = at->clone.y; 464 head->tail_y = at->clone.y;
500 } 465 }
501 break; 466 break;
502 467
503 } 468 }
504 469
505 at = new archetype; 470 at = new archetype;
471
506 at->clone.arch = at; 472 at->clone.arch = at;
507 } 473 }
508 474
509 delete at; 475 delete at;
510} 476}
… …
534 cp--; 500 cp--;
535 } 501 }
536 } 502 }
537 if (!strcmp ("Object", variable)) 503 if (!strcmp ("Object", variable))
538 { 504 {
539 if ((at = find_archetype (argument)) == NULL) 505 if ((at = archetype::find (argument)) == NULL)
540 LOG (llevError, "Warning: failed to find arch %s\n", argument); 506 LOG (llevError, "Warning: failed to find arch %s\n", argument);
541 } 507 }
542 else if (!strcmp ("other_arch", variable)) 508 else if (!strcmp ("other_arch", variable))
543 { 509 {
544 if (at != NULL && at->clone.other_arch == NULL) 510 if (at != NULL && at->clone.other_arch == NULL)
545 { 511 {
546 if ((other = find_archetype (argument)) == NULL) 512 if ((other = archetype::find (argument)) == NULL)
547 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 513 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
548 else if (at != NULL) 514 else if (at != NULL)
549 at->clone.other_arch = other; 515 at->clone.other_arch = other;
550 } 516 }
551 } 517 }
552 else if (!strcmp ("randomitems", variable)) 518 else if (!strcmp ("randomitems", variable))
553 { 519 {
554 if (at != NULL) 520 if (at != NULL)
555 { 521 {
556 treasurelist *
557 tl = find_treasurelist (argument); 522 treasurelist *tl = find_treasurelist (argument);
523
558 if (tl == NULL) 524 if (tl == NULL)
559 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 525 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
560 else 526 else
561 at->clone.randomitems = tl; 527 at->clone.randomitems = tl;
562 } 528 }
… …
566 532
567#ifdef DEBUG 533#ifdef DEBUG
568void 534void
569check_generators (void) 535check_generators (void)
570{ 536{
571 archetype * 537 archetype *at;
572 at; 538
573 for (at = first_archetype; at != NULL; at = at->next) 539 for (at = first_archetype; at != NULL; at = at->next)
574 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 540 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
575 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); 541 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
576} 542}
577#endif 543#endif
… …
584 */ 550 */
585 551
586void 552void
587load_archetypes (void) 553load_archetypes (void)
588{ 554{
589 char
590 filename[MAX_BUF]; 555 char filename[MAX_BUF];
556
591#if TIME_ARCH_LOAD 557#if TIME_ARCH_LOAD
592 struct timeval 558 struct timeval
593 tv1, 559 tv1,
594 tv2; 560 tv2;
595#endif 561#endif
… …
630 * Creates and returns a new object which is a copy of the given archetype. 596 * Creates and returns a new object which is a copy of the given archetype.
631 * This function returns NULL on failure. 597 * This function returns NULL on failure.
632 */ 598 */
633 599
634object * 600object *
635arch_to_object (archetype * at) 601arch_to_object (archetype *at)
636{ 602{
637 object * 603 object *op;
638 op; 604
639 if (at == NULL) 605 if (at == NULL)
640 { 606 {
641 if (warn_archetypes) 607 if (warn_archetypes)
642 LOG (llevError, "Couldn't find archetype.\n"); 608 LOG (llevError, "Couldn't find archetype.\n");
609
643 return NULL; 610 return NULL;
644 } 611 }
612
645 op = get_object (); 613 op = get_object ();
646 copy_object (&at->clone, op); 614 copy_object (&at->clone, op);
615 op->arch = at;
647 op->instantiate (); 616 op->instantiate ();
648 op->arch = at;
649 return op; 617 return op;
650} 618}
651 619
652/* 620/*
653 * Creates an object. This function is called by get_archetype() 621 * Creates an object. This function is called by get_archetype()
… …
659object * 627object *
660create_singularity (const char *name) 628create_singularity (const char *name)
661{ 629{
662 object *op; 630 object *op;
663 char buf[MAX_BUF]; 631 char buf[MAX_BUF];
632
664 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 633 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
665 op = get_object (); 634 op = get_object ();
666 op->name = op->name_pl = buf; 635 op->name = op->name_pl = buf;
667 SET_FLAG (op, FLAG_NO_PICK); 636 SET_FLAG (op, FLAG_NO_PICK);
668 return op; 637 return op;
… …
674 */ 643 */
675 644
676object * 645object *
677get_archetype (const char *name) 646get_archetype (const char *name)
678{ 647{
679 archetype *at; 648 archetype *at = archetype::find (name);
680 at = find_archetype (name); 649
681 if (at == NULL) 650 if (!at)
682 return create_singularity (name); 651 return create_singularity (name);
652
683 return arch_to_object (at); 653 return arch_to_object (at);
684} 654}
685 655
686/* 656/*
687 * Hash-function used by the arch-hashtable. 657 * Hash-function used by the arch-hashtable.
… …
717 * Finds, using the hashtable, which archetype matches the given name. 687 * Finds, using the hashtable, which archetype matches the given name.
718 * returns a pointer to the found archetype, otherwise NULL. 688 * returns a pointer to the found archetype, otherwise NULL.
719 */ 689 */
720 690
721archetype * 691archetype *
722find_archetype (const char *name) 692archetype::find (const char *name)
723{ 693{
724#if USE_UNORDERED_MAP
725 name = shstr::find (name);
726
727 if (!name) 694 if (!name)
728 return 0; 695 return 0;
729 696
730 HT::const_iterator i = ht.find ((size_t)name); 697#if USE_UNORDERED_MAP
698 AUTODECL (i, ht.find ((size_t) name));
731 699
732 if (i == ht.end ()) 700 if (i == ht.end ())
733 return 0; 701 return 0;
734 else 702 else
735 return i->second; 703 return i->second;
736#endif 704#endif
737 705
738 archetype *at; 706 archetype *at;
739 unsigned long index; 707 unsigned long index;
740 708
741 if (name == NULL)
742 return (archetype *) NULL;
743
744 index = hasharch (name, ARCHTABLE); 709 index = hasharch (name, ARCHTABLE);
745 arch_search++; 710 arch_search++;
746 for (;;) 711 for (;;)
747 { 712 {
748 at = arch_table[index]; 713 at = arch_table[index];
714
749 if (at == NULL) 715 if (at == NULL)
750 { 716 {
751 if (warn_archetypes) 717 if (warn_archetypes)
752 LOG (llevError, "Couldn't find archetype %s\n", name); 718 LOG (llevError, "Couldn't find archetype %s\n", name);
719
753 return NULL; 720 return NULL;
754 } 721 }
722
755 arch_cmp++; 723 arch_cmp++;
724
756 if (!strcmp ((const char *) at->name, name)) 725 if (!strcmp ((const char *) at->name, name))
757 return at; 726 return at;
727
758 if (++index >= ARCHTABLE) 728 if (++index >= ARCHTABLE)
759 index = 0; 729 index = 0;
760 } 730 }
761} 731}
762 732
… …
766 736
767static void 737static void
768add_arch (archetype *at) 738add_arch (archetype *at)
769{ 739{
770#if USE_UNORDERED_MAP 740#if USE_UNORDERED_MAP
771 ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); 741 ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
772#endif 742#endif
773 743
774 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 744 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
775 745
776 for (;;) 746 for (;;)
… …
795 */ 765 */
796 766
797archetype * 767archetype *
798type_to_archetype (int type) 768type_to_archetype (int type)
799{ 769{
800 archetype * 770 archetype *at;
801 at;
802 771
803 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 772 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
804 if (at->clone.type == type) 773 if (at->clone.type == type)
805 return at; 774 return at;
775
806 return NULL; 776 return 0;
807} 777}
808 778
809/* 779/*
810 * Returns a new object copied from the first archetype matching 780 * Returns a new object copied from the first archetype matching
811 * the given type. 781 * the given type.
… …
813 */ 783 */
814 784
815object * 785object *
816clone_arch (int type) 786clone_arch (int type)
817{ 787{
818 archetype * 788 archetype *at;
819 at;
820 object *
821 op = get_object (); 789 object *op = get_object ();
822 790
823 if ((at = type_to_archetype (type)) == NULL) 791 if ((at = type_to_archetype (type)) == NULL)
824 { 792 {
825 LOG (llevError, "Can't clone archetype %d\n", type); 793 LOG (llevError, "Can't clone archetype %d\n", type);
826 free_object (op); 794 free_object (op);
827 return NULL; 795 return NULL;
828 } 796 }
797
829 copy_object (&at->clone, op); 798 copy_object (&at->clone, op);
830 op->instantiate (); 799 op->instantiate ();
831 return op; 800 return op;
832} 801}
833 802
834/* 803/*
835 * member: make instance from class 804 * member: make instance from class
836 */ 805 */
837 806
838object * 807object *
839object_create_arch (archetype * at) 808object_create_arch (archetype *at)
840{ 809{
841 object * 810 object *op, *prev = 0, *head = 0;
842 op, *
843 prev = NULL, *head = NULL;
844 811
845 while (at) 812 while (at)
846 { 813 {
847 op = arch_to_object (at); 814 op = arch_to_object (at);
848 op->x = at->clone.x; 815 op->x = at->clone.x;
849 op->y = at->clone.y; 816 op->y = at->clone.y;
817
850 if (head) 818 if (head)
851 op->head = head, prev->more = op; 819 op->head = head, prev->more = op;
820
852 if (!head) 821 if (!head)
853 head = op; 822 head = op;
823
854 prev = op; 824 prev = op;
855 at = at->more; 825 at = at->more;
856 } 826 }
827
857 return (head); 828 return (head);
858} 829}
859 830
860/*** end of arch.c ***/

Diff Legend

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