--- deliantra/server/include/sproto.h	2009/11/11 03:52:44	1.112
+++ deliantra/server/include/sproto.h	2010/04/03 02:46:19	1.118
@@ -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);
@@ -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);
@@ -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);