--- deliantra/server/include/libproto.h	2006/08/30 16:30:37	1.7
+++ deliantra/server/include/libproto.h	2006/09/14 21:16:12	1.15
@@ -18,14 +18,12 @@
 extern void dump_arch(archetype *at);
 extern void dump_all_archetypes(void);
 extern void free_all_archs(void);
-extern archetype *get_archetype_struct(void);
 extern void check_generators(void);
 extern void load_archetypes(void);
 extern object *arch_to_object(archetype *at);
 extern object *create_singularity(const char *name);
 extern object *get_archetype(const char *name);
 extern unsigned long hasharch(const char *str, int tablesize);
-extern archetype *find_archetype(const char *name);
 extern archetype *type_to_archetype(int type);
 extern object *clone_arch(int type);
 extern object *object_create_arch(archetype *at);
@@ -185,7 +183,6 @@
 extern void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags);
 extern int on_same_map(const object *op1, const object *op2);
 /* object.c */
-extern int CAN_MERGE(object *ob1, object *ob2);
 extern signed long sum_weight(object *op);
 extern object *object_get_env_recursive(object *op);
 extern object *is_player_inv(object *op);
@@ -197,24 +194,11 @@
 extern object *find_object(tag_t i);
 extern object *find_object_name(const char *str);
 extern void free_all_object_data(void);
-extern object *get_owner(object *op);
-extern void clear_owner(object *op);
-extern void set_owner(object *op, object *owner);
-extern void copy_owner(object *op, object *clone);
-extern void reset_object(object *op);
-extern void clear_object(object *op);
 extern void copy_object(object *op2, object *op);
-extern void expand_objects(void);
-extern object *get_object(void);
 extern void update_turn_face(object *op);
 extern void update_ob_speed(object *op);
 extern void remove_from_active_list(object *op);
 extern void update_object(object *op, int action);
-extern void free_object(object *ob);
-extern void free_object2(object *ob, int free_inventory);
-extern int count_free(void);
-extern int count_used(void);
-extern int count_active(void);
 extern void sub_weight(object *op, signed long weight);
 extern void remove_ob(object *op);
 extern object *merge_ob(object *op, object *top);
@@ -334,14 +318,6 @@
 extern void parse_regions(FILE *fp);
 extern void assign_region_parents(void);
 /* shstr.c */
-extern void init_hash_table(void);
-extern const char *add_string(const char *str);
-extern const char *add_refcount(const char *str);
-extern int query_refcount(const char *str);
-extern const char *find_string(const char *str);
-extern void free_string(const char *str);
-extern void ss_dump_statistics(void);
-extern const char *ss_dump_table(int what);
 extern int buf_overflow(const char *buf1, const char *buf2, int bufsize);
 /* time.c */
 extern void reset_sleep(void);
@@ -413,10 +389,8 @@
 extern int yylex_destroy(void);
 extern void yyfree(void *ptr);
 extern int yyerror(char *s);
-extern int load_object(object_thawer &fp, object *op, int bufstate, int map_flags);
+extern int load_object(object_thawer &fp, object *op, 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(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);