--- deliantra/server/include/libproto.h 2006/09/16 22:24:12 1.17 +++ deliantra/server/include/libproto.h 2006/12/19 13:41:45 1.26 @@ -45,7 +45,7 @@ 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 check_inv(object *op, object *trig, bool move_on); extern void verify_button_links(const maptile *map); /* exp.c */ extern int new_exp(const object *ob); @@ -161,7 +161,6 @@ 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); @@ -186,21 +185,17 @@ extern signed long sum_weight(object *op); extern object *object_get_env_recursive(object *op); extern object *is_player_inv(object *op); -extern void dump_object2(object *op); -extern void dump_object(object *op); +extern char *dump_object(object *op); extern void dump_me(object *op, char *outstr); -extern void dump_all_objects(void); extern object *get_nearest_part(object *op, const object *pl); extern object *find_object(tag_t i); extern object *find_object_name(const char *str); extern void free_all_object_data(void); -extern void copy_object(object *op2, object *op); extern void update_turn_face(object *op); extern void update_ob_speed(object *op); extern void remove_from_active_list(object *op); extern void update_object(object *op, int action); 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, maptile *m, object *originator, int flag, int x, int y); extern object *insert_ob_in_map(object *op, maptile *m, object *originator, int flag); @@ -240,10 +235,7 @@ extern void path_normalize(char *path); extern char *path_combine_and_normalize(const char *src, const char *dst); /* porting.c */ -extern char *tempnam_local(const char *dir, const char *pfx); extern void remove_directory(const char *path); -extern char *strdup_local(const char *str); -extern long strtol_local(register char *str, char **ptr, register int base); extern char *strcasestr_local(const char *s, const char *find); extern int isqrt(int n); extern char *ltostr10(signed long n); @@ -267,8 +259,6 @@ extern void quest_apply_items(object *wrapper, player *pl); extern int quest_on_activate(object *ob, player *pl); extern int quest_is_override_compatible(const object *marker, const object *pl); -/* re-cmp.c */ -extern const char *re_cmp(const char *str, const char *regexp); /* readable.c */ extern int nstrtok(const char *buf1, const char *buf2); extern char *strtoktolin(const char *buf1, const char *buf2); @@ -323,11 +313,9 @@ extern void log_time(long process_utime); extern int enough_elapsed_time(void); extern void sleep_delta(void); -extern void set_max_time(long t); extern void get_tod(timeofday_t *tod); extern void print_tod(object *op); extern void time_info(object *op); -extern long seconds(void); /* treasure.c */ extern void init_archetype_pointers(void); extern void load_treasures(void);