--- deliantra/server/include/sproto.h	2007/08/16 06:36:56	1.74
+++ deliantra/server/include/sproto.h	2008/04/30 06:40:28	1.88
@@ -1,9 +1,9 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* alchemy.c */
@@ -45,7 +45,6 @@
 int improve_weapon (object *op, object *improver, object *weapon);
 int check_improve_weapon (object *op, object *tmp);
 int improve_armour (object *op, object *improver, object *armour);
-int convert_item (object *item, object *converter);
 int apply_container (object *op, object *sack);
 int esrv_apply_container (object *op, object *sack);
 void move_apply (object *trap, object *victim, object *originator);
@@ -186,7 +185,6 @@
 void examine_monster (object *op, object *tmp);
 const char *long_desc (object *tmp, object *pl);
 void examine (object *op, object *tmp);
-void inventory (object *op, object *inv);
 int command_pickup (object *op, char *params);
 void set_pickup_mode (object *op, int i);
 int command_search_items (object *op, char *params);
@@ -199,7 +197,7 @@
 void add_kill_to_party (partylist *party, const char *killer, const char *dead, long exp);
 int confirm_party_password (object *op);
 void receive_party_password (object *op, char k);
-void send_party_message (object *op, char *msg);
+void send_party_message (object *op, const char *msg);
 int command_gsay (object *op, char *params);
 int command_party (object *op, char *params);
 
@@ -242,9 +240,6 @@
 int command_learn_spell (object *op, char *params);
 int command_learn_special_prayer (object *op, char *params);
 int command_forget_spell (object *op, char *params);
-int command_listplugins (object *op, char *params);
-int command_loadplugin (object *op, char *params);
-int command_unloadplugin (object *op, char *params);
 int command_dmhide (object *op, char *params);
 void dm_stack_pop (player *pl);
 object *dm_stack_peek (player *pl);
@@ -276,7 +271,7 @@
 int move_symptom (object *symptom);
 int check_physically_infect (object *victim, object *hitter);
 object *find_disease (object *victim);
-int cure_disease (object *sufferer, object *caster);
+int cure_disease (object *sufferer, object *caster, object *spell);
 int reduce_symptoms (object *sufferer, int reduction);
 
 /* egoitem.c */
@@ -340,8 +335,6 @@
 void usage (void);
 void help (void);
 void init_beforeplay (void);
-void init_startup (void);
-void compile_info (void);
 void init_signals (void);
 void init_races (void);
 void dump_races (void);
@@ -354,7 +347,6 @@
 int verify_player (const char *name, char *password);
 int check_name (player *me, const char *name);
 int create_savedir_if_needed (char *savedir);
-void destroy_object (object *op);
 void copy_file (const char *filename, FILE *fpout);
 
 /* main.c */
@@ -371,7 +363,6 @@
 void process_events ();
 void clean_tmp_files (void);
 void leave (player *pl,int draw_exit);
-int forbid_play (void);
 void do_specials (void);
 int main (int argc, char **argv);
 
@@ -480,7 +471,7 @@
 bool move_player (object *op, int dir);
 bool handle_newcs_player (object *op);
 int save_life (object *op);
-char *gravestone_text (object *op);
+const char *gravestone_text (object *op);
 void do_some_living (object *op);
 void kill_player (object *op);
 void loot_object (object *op);
@@ -498,88 +489,6 @@
 void dragon_ability_gain (object *who, int atnr, int level);
 void player_unready_range_ob (player *pl, object *ob);
 
-/* plugins.c */
-int execute_event (object *op, int eventcode, object *activator, object *third, const char *message, int fix);
-int execute_global_event (int eventcode, ...);
-int plugins_init_plugin (const char *libfile);
-void *cfapi_get_hooks (int *type, ...);
-int plugins_remove_plugin (const char *id);
-crossfire_plugin *plugins_find_plugin (const char *id);
-void plugins_display_list (object *op);
-void *cfapi_system_find_animation (int *type, ...);
-void *cfapi_system_strdup (int *type, ...);
-void *cfapi_system_register_global_event (int *type, ...);
-void *cfapi_system_unregister_global_event (int *type, ...);
-void *cfapi_system_re_cmp (int *type, ...);
-void *cfapi_system_directory (int *type, ...);
-void *cfapi_map_get_map (int *type, ...);
-void *cfapi_map_has_been_loaded (int *type, ...);
-void *cfapi_map_create_path (int *type, ...);
-void *cfapi_map_get_map_property (int *type, ...);
-void *cfapi_map_set_map_property (int *type, ...);
-void *cfapi_map_out_of_map (int *type, ...);
-void *cfapi_map_update_position (int *type, ...);
-void *cfapi_map_delete_map (int *type, ...);
-void *cfapi_map_message (int *type, ...);
-void *cfapi_map_get_object_at (int *type, ...);
-void *cfapi_map_get_flags (int *type, ...);
-void *cfapi_map_present_arch_by_name (int *type, ...);
-void *cfapi_object_move (int *type, ...);
-void *cfapi_object_get_key (int *type, ...);
-void *cfapi_object_set_key (int *type, ...);
-void *cfapi_object_get_property (int *type, ...);
-void *cfapi_object_set_property (int *type, ...);
-void *cfapi_object_apply_below (int *type, ...);
-void *cfapi_object_apply (int *type, ...);
-void *cfapi_object_identify (int *type, ...);
-void *cfapi_object_describe (int *type, ...);
-void *cfapi_object_drain (int *type, ...);
-void *cfapi_object_fix (int *type, ...);
-void *cfapi_object_give_skill (int *type, ...);
-void *cfapi_object_transmute (int *type, ...);
-void *cfapi_object_remove (int *type, ...);
-void *cfapi_object_delete (int *type, ...);
-void *cfapi_object_clone (int *type, ...);
-void *cfapi_object_find (int *type, ...);
-void *cfapi_object_create (int *type, ...);
-void *cfapi_object_insert (int *type, ...);
-void *cfapi_object_split (int *type, ...);
-void *cfapi_object_merge (int *type, ...);
-void *cfapi_object_distance (int *type, ...);
-void *cfapi_object_update (int *type, ...);
-void *cfapi_object_clear (int *type, ...);
-void *cfapi_object_reset (int *type, ...);
-void *cfapi_object_check_inventory (int *type, ...);
-void *cfapi_object_clean_object (int *type, ...);
-void *cfapi_object_on_same_map (int *type, ...);
-void *cfapi_object_spring_trap (int *type, ...);
-void *cfapi_object_check_trigger (int *type, ...);
-void *cfapi_object_query_cost (int *type, ...);
-void *cfapi_object_query_money (int *type, ...);
-void *cfapi_object_cast (int *type, ...);
-void *cfapi_object_learn_spell (int *type, ...);
-void *cfapi_object_forget_spell (int *type, ...);
-void *cfapi_object_check_spell (int *type, ...);
-void *cfapi_object_pay_amount (int *type, ...);
-void *cfapi_object_pay_item (int *type, ...);
-void *cfapi_object_transfer (int *type, ...);
-void *cfapi_object_find_archetype_inside (int *type, ...);
-void *cfapi_object_drop (int *type, ...);
-void *cfapi_object_take (int *type, ...);
-void *cfapi_object_say (int *type, ...);
-void *cfapi_object_speak (int *type, ...);
-void *cfapi_player_find (int *type, ...);
-void *cfapi_player_message (int *type, ...);
-void *cfapi_player_send_inventory (int *type, ...);
-void *cfapi_object_teleport (int *type, ...);
-void *cfapi_object_pickup (int *type, ...);
-void *cfapi_archetype_get_first (int *type, ...);
-void *cfapi_archetype_get_property (int *type, ...);
-void *cfapi_party_get_property (int *type, ...);
-void *cfapi_region_get_property (int *type, ...);
-CommArray_s *find_plugin_command (char *cmd, object *op);
-int initPlugins (void);
-
 /* resurrection.c */
 int cast_raise_dead_spell (object *op, object *caster, object *spell, int dir, const char *arg);
 int resurrection_fails (int levelcaster, int leveldead);
@@ -606,7 +515,7 @@
 int pay_for_amount (sint64 to_pay, object *pl);
 int pay_for_item (object *op, object *pl);
 int can_pay (object *pl);
-void sell_item (object *op, object *pl);
+bool sell_item (object *op, object *pl);
 double shopkeeper_approval (const maptile *map, const object *player);
 int describe_shop (const object *op);
 void shop_listing (object *sign, object *op);
@@ -707,8 +616,6 @@
 /* spell_util.c */
 object *find_random_spell_in_ob (object *ob, const char *skill);
 void set_spell_skill (object *op, object *caster, object *spob, object *dest);
-void init_spells (void);
-void dump_spells (void);
 void spell_effect (object *spob, int x, int y, maptile *map, object *originator);
 int min_casting_level (object *caster, object *spell);
 int caster_level (object *caster, object *spell);
@@ -776,13 +683,6 @@
 void move_marker (object *op);
 void process_object (object *op);
 
-/* timers.c */
-void cftimer_process_timers (void);
-void cftimer_process_event (object *ob);
-int cftimer_create (int id, long delay, object *ob, int mode);
-int cftimer_destroy (int id);
-int cftimer_find_free_id (void);
-
 /* weather.c */
 void set_darkness_map (maptile *m);
 void adjust_daylight (void);