ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.4 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.7 by root, Mon Sep 4 17:34:50 2006 UTC

555 } 555 }
556 556
557 parse_object (tmp, thawer, map_flags); 557 parse_object (tmp, thawer, map_flags);
558 558
559 if (tmp->arch) 559 if (tmp->arch)
560 {
560 insert_ob_in_ob (tmp, op); 561 // was: insert_ob_in_ob (tmp, op);
562 // but manually adding it can improve map loading times a lot
563 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
564 CLEAR_FLAG (tmp, FLAG_REMOVED);
565 tmp->env = op;
566
567 if (!op->inv)
568 op->inv = tmp;
569 else
570 {
571 tmp->below = op->inv;
572 tmp->below->above = tmp;
573 op->inv = tmp;
574 }
575 }
561 else 576 else
562 { 577 {
563 LOG (llevDebug, "Discarding object without arch: %s\n", 578 LOG (llevDebug, "Discarding object without arch: %s\n",
564 tmp->name ? (const char *) tmp->name : "(null)"); 579 tmp->name ? (const char *) tmp->name : "(null)");
565 free_object (tmp); 580 free_object (tmp);
1008 thawer.line += strlen (thawer.line) + 1; 1023 thawer.line += strlen (thawer.line) + 1;
1009 1024
1010 break; 1025 break;
1011 1026
1012 default: 1027 default:
1013 printf ("kw abort %s\n", keyword_str [kw]);//D 1028 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]);
1014 abort (); 1029 break;
1015 } 1030 }
1016 } 1031 }
1017} 1032}
1018 1033
1019/* 1034/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines