[ViewVC] Diff of: cvs/deliantra/server/include/sproto.h

Comparing deliantra/server/include/sproto.h (file contents):
Revision 1.12 by elmex, Tue Aug 15 06:04:15 2006 UTC vs.
Revision 1.14 by elmex, Tue Aug 29 10:51:43 2006 UTC

 void destroy_object(object *op);
 int save_player(object *op, int flag);
 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);
 char *crypt_string(char *str, char *salt);
 int check_password(char *typed, char *crypted);
 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);
 int hide(object *op, object *skill);
 int jump(object *pl, int dir, object *skill);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines