--- deliantra/server/include/sproto.h	2009/11/06 12:27:05	1.109
+++ deliantra/server/include/sproto.h	2011/04/23 04:56:50	1.129
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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 Affero GNU General Public License as published by the
@@ -21,7 +21,6 @@
  */
 
 /* alchemy.c */
-int need_identify (const object *obj);
 int apply_shop_mat (object *shop_mat, object *op);
 const char *cost_string_from_value (sint64 cost, int approx);
 void pay_player (object *pl, sint64 amount);
@@ -39,30 +38,27 @@
 void do_forget_spell (object *op, const char *spell);
 void apply_scroll (object *op, object *tmp, int dir);
 void apply_poison (object *op, object *tmp);
-int manual_apply (object *op, object *tmp, int aflag);
-int player_apply (object *pl, object *op, int aflag, int quiet);
 void player_apply_below (object *pl);
 int can_apply_object (object *who, object *op);
-int apply_special (object *who, object *op, int aflags);
 int auto_apply (object *op);
 void fix_auto_apply (maptile *m);
 void eat_special_food (object *who, object *food);
 void apply_changes_to_player (object *pl, object *change);
-extern void handle_apply_yield (object *op);
+void handle_apply_yield (object *op);
 void apply_lamp (object *op, bool switch_on);
 void get_animation_from_arch (object *op, arch_ptr a);
-extern int convert_item (object *item, object *converter);
+int convert_item (object *item, object *converter);
 
 /* attack.c */
 void cancellation (object *op);
 void save_throw_object (object *op, int type, object *originator);
-int hit_map (object *op, int dir, int type, int full_hit);
+int hit_map (object *op, int dir, uint32_t type, int full_hit);
 int attack_ob (object *op, object *hitter);
 object *hit_with_arrow (object *op, object *victim);
-int hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic);
+int hit_player_attacktype (object *op, object *hitter, int dam, uint32_t attacknum, int magic);
 int kill_object (object *op, int dam, object *hitter, int type);
 int friendly_fire (object *op, object *hitter);
-int hit_player (object *op, int dam, object *hitter, int type, int full_hit);
+int hit_player (object *op, int dam, object *hitter, uint32_t type, int full_hit);
 void confuse_player (object *op, object *hitter, int dam);
 void blind_player (object *op, object *hitter, int dam);
 void paralyze_player (object *op, object *hitter, int dam);
@@ -116,6 +112,10 @@
 int command_southwest (object *op, char *params);
 int command_west (object *op, char *params);
 int command_stay (object *op, char *params);
+int command_run (object *op, char *params);
+int command_run_stop (object *op, char *params);
+int command_fire (object *op, char *params);
+int command_fire_stop (object *op, char *params);
 
 /* c_new.c */
 void execute_newserver_command (object *pl, char *command);
@@ -139,7 +139,6 @@
 int command_dropall (object *op, char *params);
 int command_drop (object *op, char *params);
 int command_examine (object *op, char *params);
-object *find_marked_object (object *op);
 void examine_monster (object *op, object *tmp);
 const char *long_desc (object *tmp, object *pl);
 void examine (object *op, object *tmp);
@@ -147,10 +146,13 @@
 void set_pickup_mode (object *op, int i);
 int command_search_items (object *op, char *params);
 int command_rename_item (object *op, char *params);
+int command_unlock (object *op, char *params);
+int command_lock (object *op, char *params);
+int command_mark (object *op, char *params);
 
 /* c_party.c */
-partylist *get_firstparty (void);
-void obsolete_parties (void);
+partylist *get_firstparty ();
+void obsolete_parties ();
 void add_kill_to_party (partylist *party, const char *killer, const char *dead, long exp);
 void receive_party_password (object *op, char k);
 int command_gsay (object *op, char *params);
@@ -200,11 +202,6 @@
 int command_diff (object *op, char *params);
 int command_insert_into (object *op, char *params);
 
-/* commands.c */
-void init_commands (void);
-CommFunc find_oldsocket_command (char *cmd);
-CommFunc find_oldsocket_command2 (char *cmd);
-
 /* daemon.c */
 FILE *BecomeDaemon (const char *filename);
 
@@ -218,9 +215,6 @@
 /* egoitem.c */
 int apply_power_crystal (object *op, object *crystal);
 
-/* hiscore.c */
-void check_score (object *op);
-
 /* gods.c */
 object *find_god (shstr_cmp name);
 shstr_tmp determine_god (object *op);
@@ -230,13 +224,12 @@
 int tailor_god_spell (object *spellop, object *caster);
 
 /* init.c */
-void load_settings (void);
-void load_materials (void);
+void load_settings ();
 void init (int argc, char **argv);
-void usage (void);
-void help (void);
-void init_beforeplay (void);
-void init_signals (void);
+void usage ();
+void help ();
+void init_beforeplay ();
+void init_signals ();
 racelink *find_racelink (const char *name);
 
 /* login.c */
@@ -256,7 +249,7 @@
 char *clean_path (const char *file);
 char *unclean_path (const char *src);
 void enter_exit (object *op, object *exit_ob);
-void clean_tmp_files (void);
+void clean_tmp_files ();
 void leave (player *pl,int draw_exit);
 int main (int argc, char **argv);
 
@@ -277,8 +270,6 @@
 int can_see_enemy (object *op, object *enemy);
 
 /* move.c */
-int move_object (object *op, int dir);
-int move_ob (object *op, int dir, object *originator);
 int transfer_ob (object *op, int x, int y, int randomly, object *originator);
 int teleport (object *teleporter, uint8 tele_type, object *user);
 void recursive_roll (object *op, int dir, object *pusher);
@@ -287,7 +278,7 @@
 /* pets.c */
 object *get_pet_enemy (object *pet, rv_vector *rv);
 void terminate_all_pets (object *owner);
-void remove_all_pets (maptile *map);
+void move_all_pets ();
 int follow_owner (object *ob, object *owner);
 void pet_move (object *ob);
 void move_golem (object *op);
@@ -316,15 +307,15 @@
 int key_confirm_quit (object *op, char key);
 int check_pick (object *op);
 int fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy);
-bool fire (object *op, int dir);
+bool fire (object *who, int dir);
 object *find_key (object *pl, object *container, object *door);
 bool move_player_attack (object *op, int dir);
 bool move_player (object *op, int dir);
 bool handle_newcs_player (object *op);
 void do_some_living (object *op);
 void kill_player (object *op);
-void fix_weight (void);
-void fix_luck (void);
+void fix_weight ();
+void fix_luck ();
 void cast_dust (object *op, object *throw_ob, int dir);
 void make_visible (object *op);
 int is_true_undead (object *op);
@@ -334,7 +325,6 @@
 int player_can_view (object *pl, object *op);
 int op_on_battleground (object *op, int *x, int *y);
 void dragon_ability_gain (object *who, int atnr, int level);
-void player_unready_range_ob (player *pl, object *ob);
 
 /* resurrection.c */
 int cast_raise_dead_spell (object *op, object *caster, object *spell, int dir, const char *arg);
@@ -351,8 +341,6 @@
 
 /* shop.c */
 int get_payment (object *pl);
-sint64 query_cost (const object *tmp, object *who, int flag);
-const char *query_cost_string (const object *tmp, object *who, int flag);
 sint64 query_money (const object *op);
 int pay_for_amount (sint64 to_pay, object *pl);
 int pay_for_item (object *op, object *pl);
@@ -361,7 +349,6 @@
 double shopkeeper_approval (const maptile *map, const object *player);
 int describe_shop (const object *op);
 void shop_listing (object *sign, object *op);
-bool is_in_shop (object *o);
 bool is_in_shop (maptile *map, int x, int y);
 
 /* skills.c */
@@ -378,9 +365,11 @@
 void meditate (object *pl, object *skill);
 int write_on_item (object *pl, const char *params, object *skill);
 int skill_throw (object *op, object *part, int dir, const char *params, object *skill);
+bool skill_mining (object *who, object *tool, object *skill, int dir, const char *string);
+bool skill_fishing (object *who, object *tool, object *skill, int dir, const char *string);
 
 /* skill_util.c */
-void init_skills (void);
+void init_skills ();
 void link_player_skills (object *op);
 int do_skill (object *op, object *part, object *skill, int dir, const char *string);
 int calc_skill_exp (object *who, object *op, object *skill);
@@ -432,7 +421,6 @@
 int magic_wall (object *op, object *caster, int dir, object *spell_ob);
 int dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam);
 int cast_heal (object *op, object *caster, object *spell, int dir);
-int change_ability_duration (object *spell, object *caster);
 int cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent);
 int cast_bless (object *op, object *caster, object *spell_ob, int dir);
 int alchemy (object *op, object *caster, object *spell_ob);
@@ -453,12 +441,6 @@
 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 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, shstr_cmp name);
 object *lookup_spell_by_name (object *op, const char *spname);
 int reflwall (maptile *m, int x, int y, object *sp_op);
@@ -482,13 +464,13 @@
 void move_deep_swamp (object *op);
 
 /* swap.c */
-void read_map_log (void);
+void read_map_log ();
 void swap_map (maptile *map);
-void check_active_maps (void);
+void check_active_maps ();
 maptile *map_least_timeout (char *except_level);
 void swap_below_max (char *except_level);
 int players_on_map (maptile *m, int show_all);
-void flush_old_maps (void);
+void flush_old_maps ();
 
 /* time.c */
 void remove_door (object *op);
@@ -506,4 +488,4 @@
 void process_object (object *op);
 
 /* weather.c */
-void adjust_daylight (void);
+void adjust_daylight ();