--- deliantra/server/include/sproto.h	2008/04/20 00:44:12	1.83
+++ deliantra/server/include/sproto.h	2008/12/31 17:35:37	1.96
@@ -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
  * 
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,7 +134,6 @@
 int command_statistics (object *pl, char *params);
 int command_fix_me (object *op, char *params);
 int command_players (object *op, char *paramss);
-int command_logs (object *op, char *params);
 int command_bowmode (object *op, char *params);
 int command_showpets (object *op, char *params);
 int command_resistances (object *op, char *params);
@@ -177,7 +176,7 @@
 int command_take (object *op, char *params);
 void put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof);
 void drop_object (object *op, object *tmp, uint32 nrof);
-void update_after_inventory_change (object *op);
+void drop_object (object *dropper, object *obj);
 void drop (object *op, object *tmp);
 int command_dropall (object *op, char *params);
 int command_drop (object *op, char *params);
@@ -198,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);
 
@@ -263,17 +262,10 @@
 
 /* disease.c */
 int move_disease (object *disease);
-int remove_symptoms (object *disease);
-object *find_symptom (object *disease);
-int check_infection (object *disease);
 int infect_object (object *victim, object *disease, int force);
-int do_symptoms (object *disease);
-int grant_immunity (object *disease);
 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, object *spell);
-int reduce_symptoms (object *sufferer, int reduction);
 
 /* egoitem.c */
 int create_artifact (object *op, const char *artifactname);
@@ -287,7 +279,7 @@
 /* gods.c */
 int lookup_god_by_name (const char *name);
 object *find_god (const char *name);
-const char *determine_god (object *op);
+shstr_tmp determine_god (object *op);
 void pray_at_altar (object *pl, object *altar, object *skill);
 void become_follower (object *op, object *new_god);
 int worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string);
@@ -298,40 +290,12 @@
 int god_examines_priest (object *op, object *god);
 int god_examines_item (object *god, object *item);
 int get_god (object *priest);
-const char *get_god_for_race (const char *race);
+shstr_tmp get_god_for_race (const char *race);
 int tailor_god_spell (object *spellop, object *caster);
 
 /* init.c */
-void set_logfile (char *val);
-void call_version (void);
-void showscores (void);
-void set_debug (void);
-void unset_debug (void);
-void set_mondebug (void);
-void set_dumpmon1 (void);
-void set_dumpmon2 (void);
-void set_dumpmon3 (void);
-void set_dumpmon4 (void);
-void set_dumpmon5 (void);
-void set_dumpmon6 (void);
-void set_dumpmon7 (void);
-void set_dumpmon8 (void);
-void set_dumpmon9 (void);
-void set_dumpmont (char *name);
-void set_daemon (void);
-void set_datadir (char *path);
-void set_confdir (char *path);
-void set_localdir (char *path);
-void set_mapdir (char *path);
-void set_archetypes (char *path);
-void set_regions (char *path);
-void set_treasures (char *path);
-void set_uniquedir (char *path);
-void set_templatedir (char *path);
-void set_playerdir (char *path);
-void set_tmpdir (char *path);
-void showscoresparm (char *data);
-void set_csport (char *val);
+void load_settings (void);
+void load_materials (void);
 void init (int argc, char **argv);
 void usage (void);
 void help (void);
@@ -348,7 +312,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 */
@@ -434,7 +397,6 @@
 int summon_golem (object *op, object *caster, int dir, object *spob);
 object *choose_cult_monster (object *pl, object *god, int summon_level);
 int summon_object (object *op, object *caster, object *spell_ob, int dir, const char *stringarg);
-object *get_real_owner (object *ob);
 int should_arena_attack (object *pet, object *owner, object *target);
 
 /* player.c */
@@ -473,7 +435,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);
@@ -517,7 +479,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);
@@ -620,7 +582,7 @@
 void set_spell_skill (object *op, object *caster, object *spob, object *dest);
 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);
+int casting_level (object *caster, object *spell);
 sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
 int SP_level_dam_adjust (object *caster, object *spob);
 int SP_level_duration_adjust (object *caster, object *spob);