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.112 by root, Tue Apr 29 15:19:30 2008 UTC vs.
Revision 1.113 by root, Fri May 2 21:01:53 2008 UTC

1018 1018
1019 assert (arch); //D maybe use exception handling of sorts? 1019 assert (arch); //D maybe use exception handling of sorts?
1020 1020
1021 f.next (); 1021 f.next ();
1022 1022
1023 object *op = object::create (); 1023 object *op = arch->instance ();
1024
1025 op->map = map; 1024 op->map = map;
1026 arch->copy_to (op);
1027 // copy_to activates, this should be fixed properly 1025 // instance() activates, this should be fixed properly
1028 op->deactivate (); 1026 op->deactivate ();
1029 1027
1030 if (!op->parse_kv (f)) 1028 if (!op->parse_kv (f))
1031 { 1029 {
1032 op->destroy (true); 1030 op->destroy (true);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines