--- deliantra/server/include/libproto.h 2006/12/30 10:16:10 1.32 +++ deliantra/server/include/libproto.h 2007/02/07 02:04:46 1.39 @@ -138,22 +138,10 @@ extern void make_sure_seen(const object *op); extern void make_sure_not_seen(const object *op); /* map.c */ -extern const char *create_pathname(const char *name); -extern const char *create_overlay_pathname(const char *name); -extern const char *create_template_pathname(const char *name); +extern const char *create_pathname (const char *name); extern int check_path(const char *name, int prepend_dir); -extern int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); extern int blocked_link(object *ob, maptile *m, int sx, int sy); -extern int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); extern void fix_container(object *container); -extern void load_objects(maptile *m, object_thawer &fp, int mapflags); -extern void save_objects(maptile *m, object_freezer &fp, object_freezer &fp2, int flag); -extern int change_map_light(maptile *m, int change); -extern int out_of_map(maptile *m, int x, int y); -extern maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); -extern void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); -extern void get_rangevector_from_mapcoord(const maptile *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 signed long sum_weight(object *op); extern object *object_get_env_recursive(object *op); @@ -189,7 +177,6 @@ extern int find_dir(maptile *m, int x, int y, object *exclude); extern int distance(const object *ob1, const object *ob2); extern int find_dir_2(int x, int y); -extern int absdir(int d); 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); @@ -207,7 +194,6 @@ /* porting.c */ extern void remove_directory(const char *path); extern char *strcasestr_local(const char *s, const char *find); -extern int isqrt(int n); extern char *ltostr10(signed long n); extern char *doubletostr10(double v); extern FILE *open_and_uncompress(const char *name, int flag, int *compressed); @@ -264,18 +250,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 */ @@ -319,8 +295,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 int rndm(int min, int max); -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);