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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC vs.
Revision 1.121 by root, Thu May 3 10:39:46 2007 UTC

   ob->remove ();
   ob->map = 0;
   party = 0;
-  // for weird reasons, this is often "ob", keeping a circular reference
+  combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
-  ranges [range_skill] = 0;
   players.erase (this);
 }
 // connect the player with a specific client
   ns->reset_stats ();
   /* make sure he's a player -- needed because of class change. */
   ob->type = PLAYER; // we are paranoid
   ob->race = ob->arch->clone.race;
-  if (!legal_range (ob, shoottype))
-    shoottype = range_none;
   ob->carrying = sum_weight (ob);
   link_player_skills (ob);
   CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
   unapply = unapply_nochoice;
   savebed_map = first_map_path;      /* Init. respawn position */
   gen_sp_armour = 10;
-  shoottype = range_none;
   bowtype = bow_normal;
   petmode = pet_normal;
   listening = 10;
   usekeys = containers;
   peaceful = 1;              /* default peaceful */
  * find_better_arrow to find a decent arrow to use.
  * op = the shooter
  * type = bow->race
  * dir = fire direction
  */
 object *
 pick_arrow_target (object *op, const char *type, int dir)
 {
   object *tmp = NULL;
   maptile *m;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
       return 0;
     }
-  if (op->type == PLAYER)
+  if (player *pl = op->contr)
-    bow = op->contr->ranges[range_bow];
+    {
+      bow = pl->ranged_ob;
+      op->set_weapon (bow);
+    }
   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 (!bow)
         {
           LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
           return 0;
         }
+      // optimisation: move object to top so we will find it quickly again
+      if (bow->below)
+        {
+          bow->remove ();
+          op->insert (bow);
+        }
     }
   if (!bow->race || !bow->skill)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
           if (op->type == PLAYER)
             new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
           /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
           else
             CLEAR_FLAG (op, FLAG_READY_BOW);
           return 0;
         }
     }
   mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
       op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
       op->update_stats ();
     }
   SET_ANIMATION (arrow, arrow->direction);
-  arrow->stats.sp = arrow->stats.wc;    /* save original wc and dam */
+  arrow->stats.sp    = arrow->stats.wc;    /* save original wc and dam */
-  arrow->stats.hp = arrow->stats.dam;
+  arrow->stats.hp    = arrow->stats.dam;
   arrow->stats.grace = arrow->attacktype;
-  if (arrow->slaying != NULL)
+  if (arrow->slaying)
     arrow->spellarg = strdup (arrow->slaying);
-  /* Note that this was different for monsters - they got their level
+  arrow->stats.dam += op->stats.dam + arrow->magic;
-   * added to the damage.  I think the strength bonus is more proper.
-   */
-  arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
   /* update the speed */
   arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
                            0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
   arrow->set_speed (max (arrow->speed, 1.0));
   arrow->speed_left = 0;
+  arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
   if (op->type == PLAYER)
     {
-      arrow->stats.wc = 20 - bow->magic - arrow->magic -
-        (op->chosen_skill ? op->chosen_skill->level : op->level) -
-        dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
       arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
+      arrow->stats.wc -= dex_bonus[op->stats.Dex];
+      if (!arrow->slaying)
+        arrow->slaying = op->slaying;
     }
   else
     {
-      arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
       arrow->level = op->level;
-    }
+      arrow->stats.wc -= bow->magic;
-  if (arrow->attacktype == AT_PHYSICAL)
+      if (!arrow->slaying)
+        arrow->slaying = bow->slaying;
+    }
+  arrow->stats.wc -= arrow->level;
-    arrow->attacktype |= bow->attacktype;
+  arrow->attacktype |= bow->attacktype;
-  if (bow->slaying)
-    arrow->slaying = bow->slaying;
   arrow->move_type = MOVE_FLY_LOW;
   arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
   play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
 {
   int ret = 0, wcmod = 0;
   if (op->contr->bowtype == bow_bestarrow)
     {
-      ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);
+      ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
     }
   else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
     {
       if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
         wcmod = -1;
   else if (op->contr->bowtype == bow_spreadshot)
     {
       ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
       ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
       ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
     }
   else
     {
       /* Simple case */
       ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
     }
   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 *item;
+  object *item = op->contr->ranged_ob;
-  if (!op->contr->ranges[range_misc])
+  if (!item)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
       return;
     }
-  item = op->contr->ranges[range_misc];
   if (!item->inv)
     {
       LOG (llevError, "Object %s lacks a spell\n", &item->name);
       return;
     }
+  op->set_weapon (item);
   if (item->type == WAND)
     {
       if (item->stats.food <= 0)
         {
           play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
           new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
           return;
         }
     }
   else if (item->type == ROD || item->type == HORN)
     {
       if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
         {
           play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
           if (item->type == ROD)
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
           else
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
           return;
         }
     }
   if (cast_spell (op, item, dir, item->inv, NULL))
   /* check for loss of invisiblity/hide */
   if (action_makes_visible (op))
     make_visible (op);
-  switch (op->contr->shoottype)
+  player *pl = op->contr;
+  if (pl->golem)
     {
-      case range_none:
+      control_golem (op->contr->golem, dir);
-        return;
+      return;
+    }
-      case range_bow:
+  object *ob = pl->ranged_ob;
+  if (!ob)
+    return;
+  switch (ob->type)
+    {
+      case BOW:
         player_fire_bow (op, dir);
-        return;
+        break;
-      case range_magic:        /* Casting spells */
+      case SPELL:
-        spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));
+        spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
-        return;
+        break;
-      case range_misc:
+      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);
-        return;
+        break;
-      case range_golem:        /* Control summoned monsters from scrolls */
-        control_golem (op->contr->ranges[range_golem], dir);
-        return;
-      case range_skill:
-        if (!op->chosen_skill)
-          {
-            if (op->type == PLAYER)
-              new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
-            return;
-          }
-        do_skill (op, op, op->chosen_skill, dir, NULL);
-        return;
-      case range_builder:
-        apply_map_builder (op, dir);
-        return;
-      default:
-        new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
-        return;
     }
 }
 /* find_key
  * We try to find a key for the door as passed.  If we find a key
   if (key)
     {
       object *container = key->env;
       play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
       if (action_makes_visible (op))
         make_visible (op);
       if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
         spring_trap (door->inv, op);
       if (door->type == DOOR)
         hit_player (door, 9998, op, AT_PHYSICAL, 1);  /* Break through the door */
  */
 void
 move_player_attack (object *op, int dir)
 {
   object *tmp, *mon;
-  sint16 nx, ny;
   int on_battleground;
   maptile *m;
-  nx = freearr_x[dir] + op->x;
+  sint16 nx = freearr_x[dir] + op->x;
-  ny = freearr_y[dir] + op->y;
+  sint16 ny = freearr_y[dir] + op->y;
   on_battleground = op_on_battleground (op, 0, 0);
   /* If braced, or can't move to the square, and it is not out of the
    * map, attack it.  Note order of if statement is important - don't
           /* If we're braced, we don't want to switch places with it */
           if (op->contr->braced)
             return;
           play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
-          (void) push_ob (mon, dir, op);
+          push_ob (mon, dir, op);
           if (op->contr->tmp_invis || op->hide)
             make_visible (op);
           return;
         }
           gen_grace = op->stats.maxgrace;
           rate_grace -= rate_grace / 2 * op->contr->gen_grace;
         }
       /* Regenerate Spell Points */
-      if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
+      if (!op->contr->golem && --op->last_sp < 0)
         {
           gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
           if (op->stats.sp < op->stats.maxsp)
             {
               op->stats.sp++;
  * not readied.
  */
 void
 player_unready_range_ob (player *pl, object *ob)
 {
-  for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
+  if (pl->ob->current_weapon == ob)
+    pl->ob->current_weapon = 0;
+  if (pl->combat_ob == ob)
+    pl->combat_ob = 0;
-    if (pl->ranges[i] == ob)
+  if (pl->ranged_ob == ob)
-      {
-        pl->ranges[i] = 0;
+    pl->ranged_ob = 0;
-        if (pl->shoottype == i)
-          pl->shoottype = range_none;
-      }
 }
 sint8
 player::visibility_at (maptile *map, int x, int y) const
 {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC vs. Revision 1.121 by root, Thu May 3 10:39:46 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC vs.
Revision 1.121 by root, Thu May 3 10:39:46 2007 UTC