--- deliantra/server/include/sproto.h	2009/11/07 18:30:05	1.110
+++ deliantra/server/include/sproto.h	2010/04/02 03:41:24	1.116
@@ -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
@@ -56,13 +56,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,10 +147,12 @@
 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 (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);
@@ -201,7 +203,7 @@
 int command_insert_into (object *op, char *params);
 
 /* commands.c */
-void init_commands (void);
+void init_commands ();
 CommFunc find_oldsocket_command (char *cmd);
 CommFunc find_oldsocket_command2 (char *cmd);
 
@@ -230,12 +232,12 @@
 int tailor_god_spell (object *spellop, object *caster);
 
 /* init.c */
-void load_settings (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 */
@@ -255,7 +257,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);
 
@@ -276,8 +278,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);
@@ -322,8 +322,8 @@
 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);
@@ -333,7 +333,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);
@@ -379,7 +378,7 @@
 int skill_throw (object *op, object *part, int dir, const char *params, object *skill);
 
 /* 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);
@@ -481,13 +480,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);
@@ -505,4 +504,4 @@
 void process_object (object *op);
 
 /* weather.c */
-void adjust_daylight (void);
+void adjust_daylight ();