--- deliantra/server/include/sproto.h	2006/10/01 23:44:36	1.22
+++ deliantra/server/include/sproto.h	2006/12/19 13:41:45	1.29
@@ -27,7 +27,7 @@
 int convert_item(object *item, object *converter);
 int apply_container(object *op, object *sack);
 int esrv_apply_container(object *op, object *sack);
-void move_apply(object *trap, object *victim, object *originator);
+void move_apply(object *trap, object *victim, object *originator, bool move_on = true);
 void do_learn_spell(object *op, object *spell, int special_prayer);
 void do_forget_spell(object *op, const char *spell);
 void apply_scroll(object *op, object *tmp, int dir);
@@ -81,7 +81,8 @@
 object *get_connection_rune(object *pl, short x, short y);
 object *get_msg_book(object *pl, short x, short y);
 object *get_wall(struct mapdef *map, int x, int y);
-void fix_walls(struct mapdef *map, int x, int y);
+void fix_walls(maptile *map, int x, int y);
+void fix_walls_around(maptile *map, int x, int y);
 void apply_builder_floor(object *pl, object *material, short x, short y);
 void apply_builder_wall(object *pl, object *material, short x, short y);
 void apply_builder_item(object *pl, object *item, short x, short y);
@@ -225,7 +226,7 @@
 int command_west(object *op, char *params);
 int command_stay(object *op, char *params);
 /* c_new.c */
-int execute_newserver_command(object *pl, char *command);
+void execute_newserver_command(object *pl, char *command);
 int command_run(object *op, char *params);
 int command_run_stop(object *op, char *params);
 int command_fire(object *op, char *params);
@@ -443,10 +444,7 @@
 char *clean_path(const char *file);
 char *unclean_path(const char *src);
 void enter_exit(object *op, object *exit_ob);
-void process_active_maps(void);
-void process_players1(maptile *map);
-void process_players2(maptile *map);
-void process_events(maptile *map);
+void process_events();
 void clean_tmp_files(void);
 void cleanup(void);
 void leave(player *pl,int draw_exit);
@@ -526,7 +524,7 @@
 void send_rules(const object *op);
 void send_news(const object *op);
 int playername_ok(const char *cp);
-int add_player(NewSocket *ns);
+int add_player(client *ns);
 archetype *get_player_archetype(archetype *at);
 object *get_nearest_player(object *mon);
 int path_to_player(object *mon, object *pl, unsigned mindiff);
@@ -585,7 +583,7 @@
 crossfire_plugin *plugins_find_plugin(const char *id);
 void plugins_display_list(object *op);
 void *cfapi_system_find_animation(int *type, ...);
-void *cfapi_system_strdup_local(int *type, ...);
+void *cfapi_system_strdup(int *type, ...);
 void *cfapi_system_register_global_event(int *type, ...);
 void *cfapi_system_unregister_global_event(int *type, ...);
 void *cfapi_system_check_path(int *type, ...);