--- deliantra/server/include/player.h	2007/05/01 05:48:20	1.53
+++ deliantra/server/include/player.h	2007/05/18 19:46:22	1.57
@@ -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
 {
@@ -113,11 +120,11 @@
   bool ACC (RW, do_los);              /* If true, need to call update_los() in draw(), and clear */
   bool ACC (RW, fire_on);             /* Player should fire object, not move */
   bool ACC (RW, run_on);              /* Player should keep moving in dir until run is off */
-  bool ACC (RW, has_hit);             /* If set, weapon_sp instead of speed will count */
   bool ACC (RW, peaceful);            /* If set, won't attack friendly creatures */
   bool ACC (RW, hidden);              /* If True, player (DM) is hidden from view */
 
   float ACC (RW, weapon_sp);              /* Penalties to speed when fighting w speed >ws/10 */
+  float ACC (RW, weapon_sp_left);         // same as speed_left, but for attacks
   living ACC (RO, orig_stats);            /* Permanent real stats of player */
   object_ptr last_skill_ob[NUM_SKILLS];   /* the exp object */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */