--- deliantra/server/include/libproto.h	2006/09/14 23:13:48	1.16
+++ deliantra/server/include/libproto.h	2006/09/16 22:24:12	1.17
@@ -29,24 +29,24 @@
 extern object *object_create_arch(archetype *at);
 /* button.c */
 extern void push_button(object *op);
-extern void activate_connection (mapstruct *map, long connection, bool state = true);
+extern void activate_connection (maptile *map, long connection, bool state = true);
 extern void update_button(object *op);
-extern oblinkpt *get_connection_links (mapstruct *map, long connection);
-extern void update_buttons(mapstruct *m);
+extern oblinkpt *get_connection_links (maptile *map, long connection);
+extern void update_buttons(maptile *m);
 extern void use_trigger(object *op);
 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 int check_trigger(object *op, object *cause);
-extern void add_button_link(object *button, mapstruct *map, int connected);
+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);
 extern void check_inv(object *op, object *trig);
-extern void verify_button_links(const mapstruct *map);
+extern void verify_button_links(const maptile *map);
 /* exp.c */
 extern int new_exp(const object *ob);
 extern int has_ability(const object *ob);
@@ -141,46 +141,46 @@
 extern void clear_los(object *op);
 extern int has_carried_lights(const object *op);
 extern void update_los(object *op);
-extern void update_all_map_los(mapstruct *map);
-extern void update_all_los(const mapstruct *map, int x, int y);
+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 */
-extern mapstruct *has_been_loaded(const char *name);
+extern maptile *has_been_loaded(const char *name);
 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 int check_path(const char *name, int prepend_dir);
-extern void dump_map(const mapstruct *m);
+extern void dump_map(const maptile *m);
 extern void dump_all_maps(void);
-extern int get_map_flags(mapstruct *oldmap, mapstruct **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
-extern int blocked_link(object *ob, mapstruct *m, int sx, int sy);
-extern int ob_blocked(const object *ob, mapstruct *m, sint16 x, sint16 y);
+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(mapstruct *m, object_thawer &fp, int mapflags);
-extern void save_objects(mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag);
-extern mapstruct *get_linked_map(void);
-extern void allocate_map(mapstruct *m);
-extern mapstruct *get_empty_map(int sizex, int sizey);
-extern mapstruct *load_original_map(const char *filename, int flags);
-extern mapstruct *load_overlay_map(const char *filename, mapstruct *m);
-extern int new_save_map(mapstruct *m, int flag);
+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 maptile *get_linked_map(void);
+extern void allocate_map(maptile *m);
+extern maptile *get_empty_map(int sizex, int sizey);
+extern maptile *load_original_map(const char *filename, int flags);
+extern maptile *load_overlay_map(const char *filename, maptile *m);
+extern int new_save_map(maptile *m, int flag);
 extern void clean_object(object *op);
-extern void free_all_objects(mapstruct *m);
-extern void free_map(mapstruct *m, int flag);
-extern void delete_map(mapstruct *m);
-extern mapstruct *ready_map_name(const char *name, int flags);
-extern int calculate_difficulty(mapstruct *m);
-extern void clean_tmp_map(mapstruct *m);
+extern void free_all_objects(maptile *m);
+extern void free_map(maptile *m, int flag);
+extern void delete_map(maptile *m);
+extern maptile *ready_map_name(const char *name, int flags);
+extern int calculate_difficulty(maptile *m);
+extern void clean_tmp_map(maptile *m);
 extern void free_all_maps(void);
-extern int change_map_light(mapstruct *m, int change);
-extern void update_position(mapstruct *m, int x, int y);
-extern void set_map_reset_time(mapstruct *map);
-extern int out_of_map(mapstruct *m, int x, int y);
-extern mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y);
+extern int change_map_light(maptile *m, int change);
+extern void update_position(maptile *m, int x, int y);
+extern void set_map_reset_time(maptile *map);
+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 mapstruct *m, int x, int y, const 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);
@@ -202,31 +202,31 @@
 extern void sub_weight(object *op, signed long weight);
 extern void remove_ob(object *op);
 extern object *merge_ob(object *op, object *top);
-extern object *insert_ob_in_map_at(object *op, mapstruct *m, object *originator, int flag, int x, int y);
-extern object *insert_ob_in_map(object *op, mapstruct *m, object *originator, int flag);
+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 object *get_split_ob(object *orig_ob, uint32 nr);
 extern object *decrease_ob_nr(object *op, uint32 i);
 extern void add_weight(object *op, signed long weight);
 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, mapstruct *m, int x, int y);
-extern object *present(unsigned char type, mapstruct *m, int x, int y);
+extern object *present_arch(const archetype *at, maptile *m, int x, int y);
+extern object *present(unsigned char type, maptile *m, int x, int y);
 extern object *present_in_ob(unsigned char type, const object *op);
 extern object *present_in_ob_by_name(int type, const char *str, const object *op);
 extern object *present_arch_in_ob(const archetype *at, const object *op);
 extern void flag_inv(object *op, int flag);
 extern void unflag_inv(object *op, int flag);
 extern void set_cheat(object *op);
-extern int find_free_spot(const object *ob, mapstruct *m, int x, int y, int start, int stop);
-extern int find_first_free_spot(const object *ob, mapstruct *m, int x, int y);
+extern int find_free_spot(const object *ob, maptile *m, int x, int y, int start, int stop);
+extern int find_first_free_spot(const object *ob, maptile *m, int x, int y);
 extern void get_search_arr(int *search_arr);
-extern int find_dir(mapstruct *m, int x, int y, object *exclude);
+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(mapstruct *m, int x, int y, int dir);
+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);
@@ -305,8 +305,8 @@
 extern void free_all_recipes(void);
 /* region.c */
 extern region *get_region_by_name(const char *region_name);
-extern region *get_region_by_map(mapstruct *m);
-extern const char *get_name_of_region_for_map(const mapstruct *m);
+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);
@@ -362,7 +362,7 @@
 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 void decay_objects(mapstruct *m);
+extern void decay_objects(maptile *m);
 extern materialtype_t *name_to_material(const char *name);
 extern void transmute_materialname(object *op, const object *change);
 extern void set_materialname(object *op, int difficulty, materialtype_t *nmt);