… | |
… | |
971 | f.next (); |
971 | f.next (); |
972 | } |
972 | } |
973 | } |
973 | } |
974 | |
974 | |
975 | object * |
975 | object * |
976 | object::read (object_thawer &f) |
976 | object::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 | |