--- deliantra/server/include/libproto.h	2009/11/10 01:20:41	1.79
+++ deliantra/server/include/libproto.h	2010/04/04 04:58:46	1.86
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -25,8 +25,6 @@
 #ifndef LIBPROTO_H_
 #define LIBPROTO_H_
 
-void load_materials ();
-
 /* anim.c */
 void free_all_anim ();
 void init_anim ();
@@ -74,7 +72,7 @@
 void dump_friendly_objects ();
 void clean_friendly_list ();
 /* glue.c */
-void fatal (int err);
+void fatal (const char *msg);
 /* holy.c */
 void init_gods ();
 godlink *get_rand_god ();
@@ -143,6 +141,7 @@
 char *dump_object (object *op);
 void dump_me (object *op, char *outstr);
 object *find_object (tag_t i);
+object *find_object_uuid (UUID i);
 object *find_object_name (const char *str);
 void free_all_object_data ();
 void update_turn_face (object *op);
@@ -183,7 +182,6 @@
 /* player.c */
 void free_player (player *pl);
 int atnr_is_dragon_enabled (int attacknr);
-int is_dragon_pl (const object *op);
 /* quest.c */
 int quest_is_quest_marker (const object *marker, int task);
 int quest_is_in_progress (const object *marker, int task);
@@ -240,9 +238,8 @@
 int random_roll (int min, int max, const object *op, int goodbad);
 sint64 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad);
 int die_roll (int num, int size, const object *op, int goodbad);
-materialtype_t *name_to_material (const shstr_cmp name);
+materialtype_t *name_to_material (const shstr_tmp name);
 void transmute_materialname (object *op, const object *change);
-void set_materialname (object *op, int difficulty, materialtype_t *nmt);
 void strip_media_tag (char *message);
 void strip_endline (char *buf);
 void replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize);
@@ -250,6 +247,7 @@
 int set_variable (object *op, char *buf);
 void init_vars ();
 char *get_ob_diff (object *op, object *op2);
+bool load_resource_file_ (const char *filename);
 /* map.c */
 maptile *find_style (const char *dirname, const char *stylename, int difficulty);
 object *pick_random_object (maptile *style);