--- deliantra/server/include/sproto.h	2006/05/03 15:09:03	1.4
+++ deliantra/server/include/sproto.h	2006/08/31 10:15:15	1.16
@@ -1,4 +1,11 @@
+/* arch.c */
+archetype *find_archetype (const char *name);
 /* alchemy.c */
+int need_identify (const object *obj);
+int apply_shop_mat (object *shop_mat, object *op);
+const char *cost_string_from_value(uint64 cost, int approx);
+void pay_player (object *pl, uint64 amount);
+uint64 pay_player_arch (object *pl, const char *arch, uint64 amount);
 void attempt_do_alchemy(object *caster, object *cauldron);
 int content_recipe_value(object *op);
 int numb_ob_inside(object *op);
@@ -198,7 +205,6 @@
 int command_help(object *op, char *params);
 int onoff_value(const char *line);
 int command_quit(object *op, char *params);
-int command_suicide(object *op, char *params);
 int command_real_quit(object *op, char *params);
 int command_explore(object *op, char *params);
 int command_sound(object *op, char *params);
@@ -259,9 +265,11 @@
 int command_search_items(object *op, char *params);
 int command_rename_item(object *op, char *params);
 /* c_party.c */
+int same_party(partylist *a, partylist *b);
 partylist *get_firstparty(void);
 void remove_party(partylist *target_party);
 void obsolete_parties(void);
+void add_kill_to_party(partylist *party, char *killer, char *dead, long exp);
 int confirm_party_password(object *op);
 void receive_party_password(object *op, char k);
 void send_party_message(object *op, char *msg);
@@ -330,10 +338,8 @@
 void init_commands(void);
 CommFunc find_oldsocket_command(char *cmd);
 CommFunc find_oldsocket_command2(char *cmd);
-int parse_string(object *op, char *str);
-int parse_command(object *op, char *str);
 /* daemon.c */
-FILE *BecomeDaemon(char *filename);
+FILE *BecomeDaemon(const char *filename);
 /* disease.c */
 int move_disease(object *disease);
 int remove_symptoms(object *disease);
@@ -423,7 +429,7 @@
 racelink *find_racelink(const char *name);
 /* login.c */
 void emergency_save(int flag);
-void delete_character(const char *name, int new);
+void delete_character(const char *name, int);
 int verify_player(const char *name, char *password);
 int check_name(player *me, const char *name);
 int create_savedir_if_needed(char *savedir);
@@ -432,6 +438,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);
@@ -449,7 +456,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);
@@ -509,7 +516,7 @@
 object *get_pet_enemy(object *pet, rv_vector *rv);
 void terminate_all_pets(object *owner);
 void remove_all_pets(mapstruct *map);
-void follow_owner(object *ob, object *owner);
+int follow_owner(object *ob, object *owner);
 void pet_move(object *ob);
 object *fix_summon_pet(archetype *at, object *op, int dir, int is_golem);
 void move_golem(object *op);
@@ -677,7 +684,6 @@
 int trap_disarm(object *disarmer, object *trap, int risk, object *skill);
 void trap_adjust(object *trap, int difficulty);
 /* shop.c */
-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);
@@ -686,8 +692,11 @@
 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);
@@ -716,8 +725,6 @@
 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);
-static int attack_hth(object *pl, int dir, const char *string, object *skill);
-static int attack_melee_weapon(object *op, int dir, const char *string, object *skill);
 /* spell_attack.c */
 void check_spell_knockback(object *op);
 void forklightning(object *op, object *tmp);