--- deliantra/server/include/libproto.h	2007/01/18 19:32:37	1.36
+++ deliantra/server/include/libproto.h	2007/02/16 19:43:41	1.40
@@ -181,7 +181,6 @@
 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 *load_object_str(const char *obstr);
 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);
@@ -250,18 +249,8 @@
 extern recipe *get_random_recipe(recipelist *rpl);
 extern void free_all_recipes(void);
 /* region.c */
-extern region *get_region_by_name(const char *region_name);
-extern region *get_region_by_map(maptile *m);
-extern const char *get_name_of_region_for_map(const maptile *m);
-extern region *get_region_from_string(const char *name);
-extern int region_is_child_of_region(const region *child, const region *r);
-extern const char *get_region_longname(const region *r);
-extern const char *get_region_msg(const region *r);
 extern object *get_jail_exit(object *op);
 extern void init_regions(void);
-extern region *get_region_struct(void);
-extern void parse_regions(FILE *fp);
-extern void assign_region_parents(void);
 /* shstr.c */
 extern int buf_overflow(const char *buf1, const char *buf2, int bufsize);
 /* time.c */
@@ -305,7 +294,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 char *name);
+extern materialtype_t *name_to_material (const shstr &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,24 +303,6 @@
 extern void replace(const char *src, const char *key, const char *replacement, char *result, size_t resultsize);
 extern void make_list_like(char *input);
 /* loader.c */
-extern int lex_load(object *op, int map_flags);
-extern void yyrestart(FILE *input_file);
-extern void yypop_buffer_state(void);
-extern int yyget_lineno(void);
-extern FILE *yyget_in(void);
-extern FILE *yyget_out(void);
-extern int yyget_leng(void);
-extern char *yyget_text(void);
-extern void yyset_lineno(int line_number);
-extern void yyset_in(FILE *in_str);
-extern void yyset_out(FILE *out_str);
-extern int yyget_debug(void);
-extern void yyset_debug(int bdebug);
-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 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);