--- deliantra/server/include/sproto.h	2006/08/13 17:16:02	1.9
+++ deliantra/server/include/sproto.h	2006/09/14 21:16:12	1.19
@@ -1,6 +1,9 @@
 /* alchemy.c */
-void pay_player (object *pl, uint64 amount);
-uint64 pay_player_arch (object *pl, const char *arch, uint64 amount);
+int need_identify (const object *obj);
+int apply_shop_mat (object *shop_mat, object *op);
+const char *cost_string_from_value(sint64 cost, int approx);
+void pay_player (object *pl, sint64 amount);
+sint64 pay_player_arch (object *pl, const char *arch, sint64 amount);
 void attempt_do_alchemy(object *caster, object *cauldron);
 int content_recipe_value(object *op);
 int numb_ob_inside(object *op);
@@ -433,6 +436,7 @@
 void copy_file(const char *filename, FILE *fpout);
 void check_login(object *op);
 /* main.c */
+void server_tick ();
 void version(object *op);
 void info_keys(object *op);
 void start_info(object *op);
@@ -450,7 +454,7 @@
 void process_events(mapstruct *map);
 void clean_tmp_files(void);
 void cleanup(void);
-void leave(player *pl, int draw_exit);
+void leave(player *pl,int draw_exit);
 int forbid_play(void);
 void do_specials(void);
 int main(int argc, char **argv);
@@ -589,8 +593,6 @@
 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_directory(int *type, ...);
@@ -678,17 +680,19 @@
 int trap_disarm(object *disarmer, object *trap, int risk, object *skill);
 void trap_adjust(object *trap, int difficulty);
 /* shop.c */
-uint64 query_cost(const object *tmp, object *who, int flag);
+int get_payment(object *pl);
+sint64 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);
+sint64 query_money(const object *op);
+int pay_for_amount(sint64 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 shopkeeper_approval(const mapstruct *map, const object *player);
 int describe_shop(const object *op);
 void shop_listing(object *op);
+bool is_in_shop (object *o);
+bool is_in_shop (mapstruct *map, int x, int y);
 /* skills.c */
 int steal(object *op, int dir, object *skill);
 int pick_lock(object *pl, int dir, object *skill);