[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.134 by root, Sun May 13 08:43:12 2007 UTC vs.
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC

   draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
                         MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
   close_and_delete (fp, comp);
 }
+float
+player::weapon_speed () const
+{
+  return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
+}
 /* This loads the first map an puts the player on it. */
 static void
 set_first_map (object *op)
 {
   op->contr->maplevel = first_map_path;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
       return 0;
     }
-  if (player *pl = op->contr)
+  if (op->contr)
-    {
+    bow = op->current_weapon;
-      bow = pl->ranged_ob;
-      if (!op->change_weapon (bow))
-        return 0;
-    }
   else
     {
       for (bow = op->inv; bow; bow = bow->below)
         /* Don't check for applied - monsters don't apply bows - in that way, they
          * don't need to switch back and forth between bows and weapons.
   if (arrow->slaying)
     arrow->spellarg = strdup (arrow->slaying);
   if (player *pl = op->contr)
     {
+      if (!pl->has_hit)
-      {
+        {
-        pl->has_hit = 1;
+          pl->has_hit = 1;
-        pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
+          pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
-      }
+        }
 #if 0
           float speed = pl->weapon_sp;
           /* penalize ROF for bestarrow */
           if (pl->bowtype == bow_bestarrow)
     }
   return ret;
 }
 /* Fires a misc (wand/rod/horn) object in 'dir'.
  * Broken apart from 'fire' to keep it more readable.
  */
 void
 fire_misc_object (object *op, int dir)
   object *ob = pl->ranged_ob;
   if (!ob)
     return;
+  if (!op->change_weapon (ob))
+    return;
   switch (ob->type)
     {
       case BOW:
         player_fire_bow (op, dir);
         break;
       case BUILDER:
         apply_map_builder (op, dir);
         break;
       case SKILL:
-      case SKILL_TOOL:
         do_skill (op, op, ob, dir, 0);
         break;
       default:
         fire_misc_object (op, dir);
       /* If the creature is a pet, push it even if the player is not
        * peaceful.  Our assumption is the creature is a pet if the
        * player owns it and it is either friendly or unagressive.
        */
-      if ((op->type == PLAYER)
+      if (op->type == PLAYER
-#if COZY_SERVER
-          &&
-          ((mon->owner && mon->owner->contr
+          && ((mon->owner && mon->owner->contr
-            && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
+               && same_party (mon->owner->contr->party, op->contr->party))
-#else
-          && mon->owner == op
+              || mon->owner == op)
-#endif
           && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
         {
           /* If we're braced, we don't want to switch places with it */
           if (op->contr->braced)
             return;
       /* in certain circumstances, you shouldn't attack friendly
        * creatures.  Note that if you are braced, you can't push
        * someone, but put it inside this loop so that you won't
        * attack them either.
        */
-      if ((mon->type == PLAYER || mon->enemy != op) &&
+      if ((mon->type == PLAYER || mon->enemy != op)
-          (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
+          && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
-#ifdef PROHIBIT_PLAYERKILL
-            (op->contr->peaceful
+          && ((op->contr->peaceful
-             || (mon->type == PLAYER
+               || (mon->type == PLAYER && mon->contr->peaceful))
-                 && mon->contr->
-                 peaceful)) &&
-#else
-            op->contr->peaceful &&
-#endif
-            !on_battleground))
+              && !on_battleground))
         {
           if (!op->contr->braced)
             {
               play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
               push_ob (mon, dir, op);
        * that party_number -1 is no party, so attacks can still happen.
        */
       else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
                ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
         {
+          if (!op->contr->has_hit)
+            {
-          op->contr->has_hit = 1;
+              op->contr->has_hit = 1;
-          op->speed_left += op->contr->weapon_sp - op->speed;
+              op->speed_left += op->contr->weapon_speed () - op->speed;
+            }
           skill_attack (mon, op, 0, 0, 0);
           /* If attacking another player, that player gets automatic
            * hitback, and doesn't loose luck either.
         }
       /* Digestion */
       if (--op->last_eat < 0)
         {
-#ifdef COZY_SERVER
-          int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
-          int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
-#else
           int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
-#endif
           if (op->contr->gen_hp > 0)
             op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
           else
             op->last_eat = 25 * (1 + bonus) / (penalty + 1);

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.134 by root, Sun May 13 08:43:12 2007 UTC vs. Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.134 by root, Sun May 13 08:43:12 2007 UTC vs.
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC