--- deliantra/server/include/sproto.h	2006/02/03 07:12:51	1.1.1.1
+++ deliantra/server/include/sproto.h	2006/02/22 18:01:59	1.1.1.2
@@ -1,5 +1,4 @@
 /* alchemy.c */
-char *cauldron_sound(void);
 void attempt_do_alchemy(object *caster, object *cauldron);
 int content_recipe_value(object *op);
 int numb_ob_inside(object *op);
@@ -11,10 +10,10 @@
 void remove_contents(object *first_ob, object *save_item);
 int calc_alch_danger(object *caster, object *cauldron, recipe *rp);
 /* apply.c */
+int transport_can_hold(const object *transport, const object *op, int nrof);
+int apply_transport(object *pl, object *transport, int aflag);
 int should_director_abort(object *op, object *victim);
 int apply_potion(object *op, object *tmp);
-int check_item(object *op, const char *item);
-int check_weapon_power(object *who, int improvs);
 int improve_weapon_stat(object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname);
 int prepare_weapon(object *op, object *improver, object *weapon);
 int improve_weapon(object *op, object *improver, object *weapon);
@@ -258,7 +257,7 @@
 int command_search_items(object *op, char *params);
 int command_rename_item(object *op, char *params);
 /* c_party.c */
-partylist* get_firstparty(void);
+partylist *get_firstparty(void);
 void remove_party(partylist *target_party);
 void obsolete_parties(void);
 int confirm_party_password(object *op);
@@ -287,6 +286,7 @@
 int command_goto(object *op, char *params);
 int command_generate(object *op, char *params);
 int command_freeze(object *op, char *params);
+int command_arrest(object *op, char *params);
 int command_summon(object *op, char *params);
 int command_teleport(object *op, char *params);
 int command_create(object *op, char *params);
@@ -323,6 +323,7 @@
 int command_stack_list(object *op, char *params);
 int command_stack_clear(object *op, char *params);
 int command_diff(object *op, char *params);
+int command_insert_into(object *op, char *params);
 /* commands.c */
 void init_commands(void);
 CommFunc find_oldsocket_command(char *cmd);
@@ -519,9 +520,9 @@
 /* player.c */
 player *find_player(const char *plname);
 player *find_player_partial_name(const char *plname);
-void display_motd(object *op);
-void send_rules(object *op);
-void send_news(object *op);
+void display_motd(const object *op);
+void send_rules(const object *op);
+void send_news(const object *op);
 int playername_ok(const char *cp);
 int add_player(NewSocket *ns);
 archetype *get_player_archetype(archetype *at);
@@ -581,15 +582,15 @@
 int plugins_remove_plugin(const char *id);
 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_register_global_event(int *type, ...);
 void *cfapi_system_unregister_global_event(int *type, ...);
 void *cfapi_system_add_string(int *type, ...);
 void *cfapi_system_remove_string(int *type, ...);
 void *cfapi_system_check_path(int *type, ...);
 void *cfapi_system_re_cmp(int *type, ...);
-void *cfapi_system_strdup_local(int *type, ...);
 void *cfapi_system_directory(int *type, ...);
-void *cfapi_system_find_animation(int *type, ...);
 void *cfapi_map_get_map(int *type, ...);
 void *cfapi_map_has_been_loaded(int *type, ...);
 void *cfapi_map_create_path(int *type, ...);
@@ -600,12 +601,14 @@
 void *cfapi_map_delete_map(int *type, ...);
 void *cfapi_map_message(int *type, ...);
 void *cfapi_map_get_object_at(int *type, ...);
-void *cfapi_map_get_flags(int* type, ...);
-void *cfapi_map_present_arch_by_name(int* type, ...);
-void *cfapi_object_get_key(int* type,...);
-void *cfapi_object_set_key(int* type,...);
+void *cfapi_map_get_flags(int *type, ...);
+void *cfapi_map_present_arch_by_name(int *type, ...);
+void *cfapi_object_move(int *type, ...);
+void *cfapi_object_get_key(int *type, ...);
+void *cfapi_object_set_key(int *type, ...);
 void *cfapi_object_get_property(int *type, ...);
 void *cfapi_object_set_property(int *type, ...);
+void *cfapi_object_apply_below(int *type, ...);
 void *cfapi_object_apply(int *type, ...);
 void *cfapi_object_identify(int *type, ...);
 void *cfapi_object_describe(int *type, ...);
@@ -649,12 +652,10 @@
 void *cfapi_player_send_inventory(int *type, ...);
 void *cfapi_object_teleport(int *type, ...);
 void *cfapi_object_pickup(int *type, ...);
-void *cfapi_object_move(int* type, ...);
-void *cfapi_object_apply_below(int* type, ...);
-void *cfapi_archetype_get_first(int* type, ...);
-void *cfapi_archetype_get_property(int* type, ...);
-void *cfapi_party_get_property(int* type, ...);
-void *cfapi_region_get_property(int* type, ...);
+void *cfapi_archetype_get_first(int *type, ...);
+void *cfapi_archetype_get_property(int *type, ...);
+void *cfapi_party_get_property(int *type, ...);
+void *cfapi_region_get_property(int *type, ...);
 CommArray_s *find_plugin_command(char *cmd, object *op);
 int initPlugins(void);
 /* resurrection.c */
@@ -674,19 +675,16 @@
 int trap_disarm(object *disarmer, object *trap, int risk, object *skill);
 void trap_adjust(object *trap, int difficulty);
 /* shop.c */
-uint64 query_cost(object *tmp, object *who, int flag);
-const char *cost_string_from_value(uint64 cost);
-const char *query_cost_string(object *tmp, object *who, int flag);
-uint64 query_money(object *op);
+double shopkeeper_approval(const mapstruct *map, const object *player);
+uint64 query_cost(const object *tmp, object *who, int flag);
+const char *query_cost_string(const object *tmp, object *who, int flag);
+uint64 query_money(const object *op);
 int pay_for_amount(uint64 to_pay, object *pl);
 int pay_for_item(object *op, object *pl);
 int can_pay(object *pl);
 int get_payment(object *pl, object *op);
 void sell_item(object *op, object *pl);
-double shop_specialisation_ratio(object *item, mapstruct *map);
-double shop_greed(mapstruct *map);
-double shopkeeper_approval(mapstruct *map, object *player);
-int describe_shop(object *op);
+int describe_shop(const object *op);
 void shop_listing(object *op);
 /* skills.c */
 int steal(object *op, int dir, object *skill);
@@ -713,7 +711,7 @@
 int do_skill(object *op, object *part, object *skill, int dir, const char *string);
 int calc_skill_exp(object *who, object *op, object *skill);
 int learn_skill(object *pl, object *scroll);
-void show_skills(object *op, const char* search);
+void show_skills(object *op, const char *search);
 int use_skill(object *op, const char *string);
 int skill_attack(object *tmp, object *pl, int dir, const char *string, object *skill);
 int attack_hth(object *pl, int dir, const char *string, object *skill);
@@ -849,7 +847,7 @@
 void move_firewall(object *op);
 void move_player_mover(object *op);
 void move_duplicator(object *op);
-void move_creator(object *op);
+void move_creator(object *creator);
 void move_marker(object *op);
 int process_object(object *op);
 /* timers.c */