--- deliantra/server/include/player.h	2007/04/30 04:25:30	1.51
+++ deliantra/server/include/player.h	2007/05/17 14:14:55	1.55
@@ -85,6 +85,13 @@
   uint32 ACC (RW, kills);
 };
 
+// used for pet monster logic etc.
+static bool
+same_party (partylist *a, partylist *b)
+{
+  return a == b && a;
+}
+
 INTERFACE_CLASS (player)
 struct player : zero_initialised, attachable
 {
@@ -122,10 +129,8 @@
   object_ptr last_skill_ob[NUM_SKILLS];   /* the exp object */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */
 
-  object_ptr ACC (RW, combat_skill);  // which skill to use for direct attacks
-  object_ptr ACC (RW, combat_ob);     // which weapon to use
-  object_ptr ACC (RW, ranged_skill);  // which skill to use for ranged attacks
-  object_ptr ACC (RW, ranged_ob);     // bow/spell
+  object_ptr ACC (RW, combat_ob);     // which weapon/bow/skill to use for direct attacks
+  object_ptr ACC (RW, ranged_ob);     // which skill/item/spell to use for ranged attacks
   object_ptr ACC (RW, golem);         // the currently controlled golem
 
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
@@ -165,6 +170,8 @@
 
   shstr ACC (RW, invis_race);             /* What race invisible to? */
 
+  MTH float weapon_speed () const;
+
   MTH static player *create ();
 
   static player *load_pl (object_thawer &thawer);