--- deliantra/server/include/libproto.h	2008/04/21 07:01:40	1.57
+++ deliantra/server/include/libproto.h	2008/12/28 06:59:27	1.66
@@ -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();
@@ -41,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);
@@ -147,12 +149,9 @@
 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 */
@@ -190,12 +189,7 @@
 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 *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);
@@ -299,7 +293,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);
@@ -311,3 +305,43 @@
 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 */
+/*
+ * 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
+