--- deliantra/server/include/sproto.h	2010/03/26 01:04:44	1.115
+++ deliantra/server/include/sproto.h	2012/10/29 23:55:54	1.134
@@ -1,27 +1,26 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and 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 <support@deliantra.net>
  */
 
 /* 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,11 +38,8 @@
 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);
@@ -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);
@@ -149,6 +148,7 @@
 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 ();
@@ -202,11 +202,6 @@
 int command_diff (object *op, char *params);
 int command_insert_into (object *op, char *params);
 
-/* commands.c */
-void init_commands ();
-CommFunc find_oldsocket_command (char *cmd);
-CommFunc find_oldsocket_command2 (char *cmd);
-
 /* daemon.c */
 FILE *BecomeDaemon (const char *filename);
 
@@ -220,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);
@@ -248,7 +240,7 @@
 void copy_file (const char *filename, FILE *fpout);
 
 /* main.c */
-void server_tick ();
+void one_tick ();
 void version (object *op);
 void info_keys (object *op);
 char *crypt_string (char *str, char *salt);
@@ -286,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);
@@ -315,7 +307,7 @@
 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);
@@ -333,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);
@@ -350,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);
@@ -360,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 */
@@ -377,6 +365,8 @@
 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 ();
@@ -431,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);
@@ -452,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);
@@ -506,3 +489,4 @@
 
 /* weather.c */
 void adjust_daylight ();
+