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.20 by root, Tue Nov 7 14:58:35 2006 UTC vs.
Revision 1.21 by root, Tue Dec 12 20:53:02 2006 UTC

593 op_inv = tmp; 593 op_inv = tmp;
594 } 594 }
595 else 595 else
596 { 596 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 598 tmp->destroy (0);
599 } 599 }
600 } 600 }
601 else 601 else
602 { 602 {
603 /* This is the actual archetype definition then */ 603 /* This is the actual archetype definition then */
1499 old = tmp; 1499 old = tmp;
1500 } 1500 }
1501 1501
1502 if (!(flag & 2)) 1502 if (!(flag & 2))
1503 { 1503 {
1504 remove_ob (op); 1504 op->remove ();
1505 free_object (op); 1505 op->destroy (0);
1506 } 1506 }
1507 1507
1508 fp.put (op); 1508 fp.put (op);
1509 fprintf (fp, "end\n"); 1509 fprintf (fp, "end\n");
1510} 1510}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines