--- deliantra/server/include/libproto.h	2008/04/21 23:35:24	1.58
+++ deliantra/server/include/libproto.h	2009/01/08 04:35:04	1.70
@@ -44,7 +44,6 @@
 extern void free_all_archs();
 extern void check_generators();
 extern bool load_archetype_file(const char *filename);
-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);
@@ -52,19 +51,14 @@
 extern object *clone_arch(int type);
 extern object *object_create_arch(archetype *at);
 /* button.c */
-extern void push_button(object *op);
-extern void activate_connection (maptile *map, long connection, bool state = true);
-extern void update_button(object *op);
-extern oblinkpt *get_connection_links (maptile *map, long connection);
-extern void use_trigger(object *op);
+extern void push_button(object *op, object *originator);
+extern void update_button(object *op, object *originator);
+extern void use_trigger(object *op, object *originator);
 extern void animate_turning(object *op);
 extern int check_altar_sacrifice(const object *altar, const object *sacrifice);
 extern int operate_altar(object *altar, object **sacrifice);
-extern void trigger_move(object *op, int state);
+extern void trigger_move(object *op, int state, object *originator);
 extern int check_trigger(object *op, object *cause);
-extern void add_button_link(object *button, maptile *map, int connected);
-extern void remove_button_link(object *op);
-extern oblinkpt *get_button_links(const object *button);
 extern int get_button_value(const object *button);
 extern void do_mood_floor(object *op, object *source = 0);
 extern object *check_inv_recursive(object *op, const object *trig);
@@ -150,12 +144,8 @@
 extern int did_make_save(const object *op, int level, int bonus);
 /* los.c */
 extern void init_block();
-extern void clear_los(player *pl);
-extern int has_carried_lights(const object *op);
-extern void update_los(object *op);
 extern void update_all_map_los(maptile *map);
 extern void update_all_los(const maptile *map, int x, int y);
-extern void print_los(object *op);
 extern void make_sure_seen(const object *op);
 extern void make_sure_not_seen(const object *op);
 /* map.c */
@@ -174,7 +164,7 @@
 extern object *merge_ob(object *op, object *top);
 extern object *insert_ob_in_map_at(object *op, maptile *m, object *originator, int flag, int x, int y);
 extern object *insert_ob_in_map(object *op, maptile *m, object *originator, int flag);
-extern void replace_insert_ob_in_map(const char *arch_string, object *op);
+extern void replace_insert_ob_in_map(shstr_tmp archname, object *op);
 extern object *insert_ob_in_ob(object *op, object *where);
 extern int check_move_on(object *op, object *originator);
 extern object *present_arch(const archetype *at, maptile *m, int x, int y);
@@ -193,12 +183,7 @@
 extern int dirdiff(int dir1, int dir2);
 extern int can_see_monsterP(maptile *m, int x, int y, int dir);
 extern int can_pick(const object *who, const object *item);
-extern object *object_create_clone(object *asrc);
 extern object *find_obj_by_type_subtype(const object *who, int type, int subtype);
-extern key_value *get_ob_key_link(const object *ob, const char *key);
-extern const char *get_ob_key_value(const object *op, const char *const key);
-extern int set_ob_key_value_s(object *op, const char *canonical_key, const char *value, int add_key);
-extern int set_ob_key_value(object *op, const char *key, const char *value, int add_key);
 /* path.c */
 extern char *path_combine(const char *src, const char *dst);
 extern void path_normalize(char *path);
@@ -302,7 +287,7 @@
 extern int random_roll(int min, int max, const object *op, int goodbad);
 extern sint64 random_roll64(sint64 min, sint64 max, const object *op, int goodbad);
 extern int die_roll(int num, int size, const object *op, int goodbad);
-extern materialtype_t *name_to_material (const shstr &name);
+extern materialtype_t *name_to_material (const shstr_cmp name);
 extern void transmute_materialname(object *op, const object *change);
 extern void set_materialname(object *op, int difficulty, materialtype_t *nmt);
 extern void strip_media_tag(char *message);
@@ -314,6 +299,9 @@
 extern int set_variable(object *op, char *buf);
 extern void init_vars();
 extern char *get_ob_diff(object *op, object *op2);
+/* map.c */
+extern maptile *find_style (const char *dirname, const char *stylename, int difficulty);
+extern object *pick_random_object (maptile *style);
 
 /* former funcpoint.h */
 /*