--- deliantra/server/include/libproto.h 2007/01/15 01:25:41 1.34 +++ deliantra/server/include/libproto.h 2007/04/16 06:23:41 1.43 @@ -84,7 +84,6 @@ extern void init_objects(void); extern void init_defaults(void); extern void init_dynamic(void); -extern void write_todclock(void); extern void init_clocks(void); extern void init_attackmess(void); /* item.c */ @@ -92,15 +91,15 @@ extern int calc_item_power(const object *op, int flag); extern const typedata *get_typedata(int itemtype); extern const typedata *get_typedata_by_name(const char *name); -extern char *describe_resistance(const object *op, int newline); -extern char *query_weight(const object *op); -extern char *get_levelnumber(int i); -extern char *get_number(int i); -extern char *ring_desc(const object *op); +extern const char *describe_resistance(const object *op, int newline); +extern const char *query_weight(const object *op); +extern const char *get_levelnumber(int i); +extern const char *get_number(int i); +extern const char *ring_desc(const object *op); extern const char *query_short_name(const object *op); -extern char *query_name(const object *op); +extern const char *query_name(const object *op); extern const char *query_base_name(const object *op, int plural); -extern char *describe_item(const object *op, object *owner); +extern const char *describe_item(const object *op, object *owner); extern int is_magical(const object *op); extern int need_identify(const object *op); extern void identify(object *op); @@ -177,12 +176,10 @@ 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); 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); @@ -226,7 +223,7 @@ extern char *mon_desc(const object *mon); extern object *get_next_mon(object *tmp); extern char *mon_info_msg(int level, int booksize); -extern char *artifact_msg(int level, int booksize); +extern const char *artifact_msg(int level, int booksize); extern char *spellpath_msg(int level, int booksize); extern void make_formula_book(object *book, int level); extern char *msgfile_msg(int level, int booksize); @@ -251,18 +248,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 */ @@ -276,9 +263,6 @@ /* treasure.c */ extern void init_archetype_pointers(void); extern void load_treasures(void); -extern treasurelist *find_treasurelist(const char *name); -extern void create_all_treasures(treasure *t, object *op, int flag, int difficulty, int tries); -extern void create_one_treasure(treasurelist *tl, object *op, int flag, int difficulty, int tries); extern void create_treasure(treasurelist *t, object *op, int flag, int difficulty, int tries); extern object *generate_treasure(treasurelist *t, int difficulty); extern int level_for_item(const object *op, int difficulty); @@ -306,8 +290,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); @@ -316,24 +299,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);