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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC

   attachable::do_destroy ();
   if (ob)
     {
       ob->destroy_inv (false);
-      ob->destroy (true);
+      ob->destroy ();
     }
   ob = observe = 0;
 }
                 || op->type == CLOAK   || op->type == HELMET
                 || op->type == SHIELD  || op->type == GLOVES
                 || op->type == BRACERS || op->type == GIRDLE))
               || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
             {
-              op->destroy (true);
+              op->destroy ();
               continue;
             }
         }
       /* This really needs to be better - we should really give
             if (tmp->type == op->type && tmp->name == op->name)
               break;
           if (tmp)
             {
-              op->destroy (true);
+              op->destroy ();
               LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
               continue;
             }
           if (op->nrof > 1)
           CLEAR_FLAG (op, FLAG_DAMNED);
         }
       if (op->type == SPELL)
         {
-          op->destroy (true);
+          op->destroy ();
           continue;
         }
       else if (op->type == SKILL)
         {
           SET_FLAG (op, FLAG_CAN_USE_SKILL);
   /* this should not happen, but sometimes does */
   if (arrow->nrof == 0)
     {
       LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
-      arrow->destroy (true);
+      arrow->destroy ();
       return 0;
     }
   left = arrow;                 /* these are arrows left to the player */
   arrow = arrow->split ();
 bool
 fire (object *op, int dir)
 {
   int spellcost = 0;
-  /* check for loss of invisiblity/hide */
-  if (action_makes_visible (op))
-    make_visible (op);
   player *pl = op->contr;
   if (pl->golem)
     {
       control_golem (op->contr->golem, dir);
     }
   object *ob = pl->ranged_ob;
   if (!ob)
-    return false;
-  if (!op->change_weapon (ob))
     return false;
   if (op->speed_left > 0.f)
     --op->speed_left;
   else
     return false;
+  if (!op->change_weapon (ob))
+    return false;
+  /* check for loss of invisiblity/hide */
+  if (action_makes_visible (op))
+    make_visible (op);
   switch (ob->type)
     {
       case BOW:
         player_fire_bow (op, dir);
           --op->speed_left;
           op->play_sound (sound_find ("push_player"));
           push_ob (mon, dir, op);
-          if (op->contr->tmp_invis || op->hide)
+          if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
             make_visible (op);
           return true;
         }
       else
               push_ob (mon, dir, op);
             }
           else
             op->statusmsg ("You withhold your attack");
-          if (op->contr->tmp_invis || op->hide)
+          if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
             make_visible (op);
           return true;
         }
     }
   if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
     dir = absdir (dir + rndm (3) + rndm (3) - 2);
   op->facing = dir;
-  if (op->hide)
+  if (op->flag [FLAG_HIDDEN])
     do_hidden_move (op);
   bool retval;
   if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
     if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
       {
         op->play_sound (sound_find ("ob_evaporate"));
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
-        tmp->destroy (true);
+        tmp->destroy ();
         CLEAR_FLAG (op, FLAG_LIFESAVE);
         if (op->stats.hp < 0)
           op->stats.hp = op->stats.maxhp;
           op->stats.food = 0;
           if (op->stats.hp < 0)
             {
               op->contr->killer = archetype::get ("killer_starvation");
-              op->contr->killer->destroy (true);
+              op->contr->killer->destroy ();
             }
         }
       /* killer should be set here already */
       if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
       /* restore player */
       at = archetype::find ("poisoning");
       if (object *tmp = present_arch_in_ob (at, op))
         {
-          tmp->destroy (true);
+          tmp->destroy ();
           new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
         }
       at = archetype::find ("confusion");
       if (object *tmp = present_arch_in_ob (at, op))
         {
-          tmp->destroy (true);
+          tmp->destroy ();
           new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
         }
       cure_disease (op, 0, 0);     /* remove any disease */
       op->stats.hp = op->stats.maxhp;
   at = archetype::find ("poisoning");
   tmp = present_arch_in_ob (at, op);
   if (tmp)
     {
-      tmp->destroy (true);
+      tmp->destroy ();
       new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
     }
   at = archetype::find ("confusion");
   tmp = present_arch_in_ob (at, op);
   if (tmp)
     {
-      tmp->destroy (true);
+      tmp->destroy ();
       new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
     }
   cure_disease (op, 0, 0);     /* remove any disease */
   for (object *item = op->inv; item; )
     {
       object *next = item->below;
       if (item->type == SPELL_EFFECT && item->active)
-        item->destroy (true);
+        item->destroy ();
       item = next;
     }
   /*add_exp(op, (op->stats.exp * -0.20)); */
             {
               tmp->decrease (rndm (1, tmp->nrof - 1));
               insert_ob_in_map (tmp, op->map, NULL, 0);
             }
           else
-            tmp->destroy (true);
+            tmp->destroy ();
         }
       else
         insert_ob_in_map (tmp, op->map, NULL, 0);
     }
 }
   if (op->type == PLAYER)
     new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
   cast_spell (op, throw_ob, dir, spob, NULL);
-  throw_ob->destroy (true);
+  throw_ob->destroy ();
 }
 void
 make_visible (object *op)
 {
-  op->hide = 0;
+  op->flag [FLAG_HIDDEN] = 0;
   op->invisible = 0;
   if (op->type == PLAYER)
     {
       op->contr->tmp_invis = 0;
       /* only the viewable area the player sees is updated by LOS
        * code, so we need to restrict ourselves to that range of values
        * for any meaningful values.
        */
-      if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
+      if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
-          abs (dy) <= (pl->contr->ns->mapy / 2) &&
-          !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
         return 1;
       op = op->more;
     }
       if (op->contr && op->contr->tmp_invis == 0)
         return 0;
       /* If monsters, they should become visible */
-      if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
+      if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
         {
-          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
+          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
           return 1;
         }
     }
   return 0;
   int dx, dy;
   if (!adjacent_map (map, ns->current_map, &dx, &dy))
     return 0;
-  x += dx - ns->current_x + ns->mapx / 2;
+  x += dx - ns->current_x;
-  y += dy - ns->current_y + ns->mapy / 2;
+  y += dy - ns->current_y;
-  if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
-    return 0;
-  return 100 - blocked_los [x][y];
+  return 100 - blocked_los (x, y);
 }
 void
 player::infobox (const char *title, const char *msg, int color)
 {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC