--- deliantra/server/include/libproto.h 2008/05/04 08:25:33 1.60 +++ deliantra/server/include/libproto.h 2009/01/06 19:17:06 1.68 @@ -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); @@ -150,12 +149,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 +169,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); @@ -297,7 +292,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); @@ -309,6 +304,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 */ /*