--- deliantra/server/include/sproto.h	2009/11/10 01:20:41	1.111
+++ deliantra/server/include/sproto.h	2010/04/03 22:30:21	1.119
@@ -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 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
@@ -39,8 +39,7 @@
 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);
+bool player_apply (object *pl, object *op, int aflag);
 void player_apply_below (object *pl);
 int can_apply_object (object *who, object *op);
 int apply_special (object *who, object *op, int aflags);
@@ -56,13 +55,13 @@
 /* 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);
@@ -147,6 +146,8 @@
 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);
 
 /* c_party.c */
 partylist *get_firstparty ();
@@ -276,8 +277,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);
@@ -315,7 +314,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 +332,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);
@@ -377,6 +375,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 ();