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.5 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.7 by root, Mon Sep 4 17:34:50 2006 UTC

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 {
561 // was: insert_ob_in_ob (tmp, op); 561 // was: insert_ob_in_ob (tmp, op);
562 // but manually addint it can improve map loading times a lot 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);
563 tmp->env = op; 565 tmp->env = op;
564 566
565 if (!op->inv) 567 if (!op->inv)
566 op->inv = tmp; 568 op->inv = tmp;
567 else 569 else
1021 thawer.line += strlen (thawer.line) + 1; 1023 thawer.line += strlen (thawer.line) + 1;
1022 1024
1023 break; 1025 break;
1024 1026
1025 default: 1027 default:
1026 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]);
1027 abort (); 1029 break;
1028 } 1030 }
1029 } 1031 }
1030} 1032}
1031 1033
1032/* 1034/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines