--- deliantra/server/include/libproto.h	2006/08/28 14:05:24	1.5
+++ deliantra/server/include/libproto.h	2006/09/04 16:46:32	1.11
@@ -31,7 +31,9 @@
 extern object *object_create_arch(archetype *at);
 /* button.c */
 extern void push_button(object *op);
+extern void activate_connection (mapstruct *map, long connection, bool state = true);
 extern void update_button(object *op);
+extern oblinkpt *get_connection_links (mapstruct *map, long connection);
 extern void update_buttons(mapstruct *m);
 extern void use_trigger(object *op);
 extern void animate_turning(object *op);
@@ -41,9 +43,9 @@
 extern int check_trigger(object *op, object *cause);
 extern void add_button_link(object *button, mapstruct *map, int connected);
 extern void remove_button_link(object *op);
-extern objectlink *get_button_links(const object *button);
+extern oblinkpt *get_button_links(const object *button);
 extern int get_button_value(const object *button);
-extern void do_mood_floor(object *op, object *op2);
+extern void do_mood_floor(object *op, object *source = 0);
 extern object *check_inv_recursive(object *op, const object *trig);
 extern void check_inv(object *op, object *trig);
 extern void verify_button_links(const mapstruct *map);
@@ -183,7 +185,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);
@@ -202,7 +203,6 @@
 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);
@@ -210,9 +210,6 @@
 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);
@@ -260,12 +257,9 @@
 extern char *strdup_local(const char *str);
 extern long strtol_local(register char *str, char **ptr, register int base);
 extern char *strcasestr_local(const char *s, const char *find);
-extern char *strerror_local(int errnum);
 extern int isqrt(int n);
 extern char *ltostr10(signed long n);
 extern char *doubletostr10(double v);
-extern void save_long(char *buf, char *name, long n);
-extern void save_long_long(char *buf, char *name, sint64 n);
 extern FILE *open_and_uncompress(const char *name, int flag, int *compressed);
 extern void close_and_delete(FILE *fp, int compressed);
 extern void make_path_to_file(char *filename);
@@ -335,14 +329,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);
@@ -414,10 +400,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);