--- deliantra/server/include/sproto.h	2006/08/15 06:04:15	1.12
+++ deliantra/server/include/sproto.h	2006/08/30 09:31:30	1.15
@@ -436,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);
@@ -453,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);
@@ -692,6 +693,8 @@
 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);