--- deliantra/server/include/libproto.h	2008/04/20 00:44:12	1.54
+++ deliantra/server/include/libproto.h	2008/05/03 11:14:50	1.59
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -21,6 +21,9 @@
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
+#ifndef LIBPROTO_H_
+#define LIBPROTO_H_
+
 /* anim.c */
 extern void free_all_anim();
 extern void init_anim();
@@ -160,8 +163,6 @@
 extern int blocked_link(object *ob, maptile *m, int sx, int sy);
 extern void fix_container(object *container);
 /* object.c */
-extern signed long sum_weight(object *op);
-extern object *object_get_env_recursive(object *op);
 extern char *dump_object(object *op);
 extern void dump_me(object *op, char *outstr);
 extern object *get_nearest_part(object *op, const object *pl);
@@ -170,14 +171,10 @@
 extern void free_all_object_data();
 extern void update_turn_face(object *op);
 extern void update_object(object *op, int action);
-extern void sub_weight(object *op, signed long weight);
 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 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, maptile *m, int x, int y);
@@ -198,10 +195,6 @@
 extern int can_pick(const object *who, const object *item);
 extern object *object_create_clone(object *asrc);
 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);
-extern int set_ob_key_value_s(object *op, const char *canonical_key, const char *value, int add_key);
-extern int set_ob_key_value(object *op, const char *key, const char *value, int add_key);
 /* path.c */
 extern char *path_combine(const char *src, const char *dst);
 extern void path_normalize(char *path);
@@ -317,3 +310,40 @@
 extern int set_variable(object *op, char *buf);
 extern void init_vars();
 extern char *get_ob_diff(object *op, object *op2);
+
+/* former funcpoint.h */
+/*
+ * These function-pointers are defined in common/glue.c
+ * The functions used to set and initialise them are also there.
+ *
+ * Massive change. Those functions are just defined, no callback, and they should be implemented.
+ * This means glue.c code & such can go away almost entirely.
+ * Ryo 2005-07-15
+ */
+
+extern void	move_apply(object *, object *, object *);
+extern void	draw_info(int, int, object *, const char *);
+extern void	clean_tmp_files(void);
+extern void	fix_auto_apply(maptile *);
+extern void	init_blocksview_players(void);
+extern void	monster_check_apply(object *, object *);
+extern void	process_active_maps(void);
+extern void	remove_friendly_object(object *);
+extern void	update_buttons(maptile *);
+extern void	move_teleporter(object *);
+extern void	move_firewall(object *);
+extern void	move_creator(object *);
+extern void move_marker(object *);
+extern void	move_duplicator(object *);
+extern void trap_adjust(object *, int);
+extern void	esrv_send_item(object *, object *);
+extern void	esrv_del_item(player *, int);
+extern void	esrv_update_item(int, object *, object *);
+extern void	esrv_update_spells(player *);
+extern void	set_darkness_map(maptile *m);
+extern void dragon_ability_gain(object *, int, int);
+extern void	weather_effect(const char *);
+extern object *	find_skill_by_number(object *, int);
+
+#endif
+