--- deliantra/server/include/sproto.h	2006/05/03 15:09:03	1.4
+++ deliantra/server/include/sproto.h	2006/07/03 12:31:23	1.8
@@ -198,7 +198,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 +258,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,8 +331,6 @@
 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);
 /* disease.c */
@@ -509,7 +508,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 +676,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,6 +684,7 @@
 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);
 /* skills.c */
@@ -716,8 +715,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);