--- deliantra/server/include/sproto.h	2008/08/29 02:12:25	1.90
+++ deliantra/server/include/sproto.h	2009/01/01 11:41:17	1.97
@@ -176,6 +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 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);
@@ -261,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);
@@ -283,53 +277,24 @@
 void display_high_score (object *op, int max, const char *match);
 
 /* gods.c */
-int lookup_god_by_name (const char *name);
-object *find_god (const char *name);
-const char *determine_god (object *op);
+int lookup_god_by_name (shstr_cmp name);
+object *find_god (shstr_cmp name);
+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);
 void stop_using_item (object *op, int type, int number);
 void update_priest_flag (object *god, object *exp_ob, uint32 flag);
-archetype *determine_holy_arch (object *god, const char *type);
+archetype *determine_holy_arch (object *god, shstr_cmp type);
 void god_intervention (object *op, object *god, object *skill);
 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);
 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);
@@ -431,7 +396,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 */
@@ -459,8 +423,8 @@
 void flee_player (object *op);
 int check_pick (object *op);
 object *find_arrow (object *op, const char *type);
-object *find_better_arrow (object *op, object *target, const char *type, int *better);
-object *pick_arrow_target (object *op, const char *type, int dir);
+object *find_better_arrow (object *op, object *target, shstr_cmp type, int *better);
+object *pick_arrow_target (object *op, shstr_cmp type, int dir);
 int fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy);
 int player_fire_bow (object *op, int dir);
 void fire_misc_object (object *op, int dir);
@@ -613,16 +577,16 @@
 int write_mark (object *op, object *spell, const char *msg);
 
 /* spell_util.c */
-object *find_random_spell_in_ob (object *ob, const char *skill);
+object *find_random_spell_in_ob (object *ob, shstr_cmp skill = shstr_cmp ());
 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);
 int SP_level_range_adjust (object *caster, object *spob);
-object *check_spell_known (object *op, const char *name);
+object *check_spell_known (object *op, shstr_cmp name);
 object *lookup_spell_by_name (object *op, const char *spname);
 int reflwall (maptile *m, int x, int y, object *sp_op);
 int cast_create_obj (object *op, object *caster, object *new_op, int dir);