--- deliantra/server/include/libproto.h	2006/08/27 16:15:12	1.4
+++ deliantra/server/include/libproto.h	2006/08/28 14:05:24	1.5
@@ -19,8 +19,6 @@
 extern void dump_all_archetypes(void);
 extern void free_all_archs(void);
 extern archetype *get_archetype_struct(void);
-extern void first_arch_pass(FILE *fp);
-extern void second_arch_pass(FILE *fp);
 extern void check_generators(void);
 extern void load_archetypes(void);
 extern object *arch_to_object(archetype *at);
@@ -160,8 +158,8 @@
 extern int blocked_link(object *ob, mapstruct *m, int sx, int sy);
 extern int ob_blocked(const object *ob, mapstruct *m, sint16 x, sint16 y);
 extern void fix_container(object *container);
-extern void load_objects(mapstruct *m, FILE *fp, object_thawer &thawer, int mapflags);
-extern void save_objects(mapstruct *m, FILE *fp, object_freezer &freezer, FILE *fp2, object_freezer &freezer2, int flag);
+extern void load_objects(mapstruct *m, object_thawer &fp, int mapflags);
+extern void save_objects(mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag);
 extern mapstruct *get_linked_map(void);
 extern void allocate_map(mapstruct *m);
 extern mapstruct *get_empty_map(int sizex, int sizey);
@@ -416,10 +414,10 @@
 extern int yylex_destroy(void);
 extern void yyfree(void *ptr);
 extern int yyerror(char *s);
-extern int load_object(FILE *fp, object_thawer &thawer, object *op, int bufstate, int map_flags);
+extern int load_object(object_thawer &fp, object *op, int bufstate, int map_flags);
 extern int set_variable(object *op, char *buf);
 extern void init_vars(void);
 extern char *get_ob_diff(object *op, object *op2);
-extern void save_object(FILE *fp, object_freezer &freezer, object *op, int flag);
+extern void save_object(object_freezer &fp, object *op, int flag);
 extern void insert_event(object *op, int etype, char *ehook, char *eplug, char *eoptions);
 extern event *find_event(object *op, int etype);