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.59 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.60 by root, Fri Feb 16 22:21:45 2007 UTC

… …
971 f.next (); 971 f.next ();
972 } 972 }
973} 973}
974 974
975object * 975object *
976object::read (object_thawer &f) 976object::read (object_thawer &f, maptile *map)
977{ 977{
978 assert (f.kw == KW_arch); 978 assert (f.kw == KW_arch);
979 979
980 archetype *arch = archetype::find (f.get_str ()); 980 archetype *arch = archetype::find (f.get_str ());
981 assert (arch); //D maybe use exception handling of sorts? 981 assert (arch); //D maybe use exception handling of sorts?
982 982
983 object *op = object::create (); 983 object *op = object::create ();
984 984
985 op->map = map;
985 op->arch = arch; 986 op->arch = arch;
986 arch->clone.copy_to (op); 987 arch->clone.copy_to (op);
987 // copy_to activates, this should be fixed properly 988 // copy_to activates, this should be fixed properly
988 op->deactivate (); 989 op->deactivate ();
989 990

Diff Legend

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