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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.160 by root, Wed Aug 22 20:46:46 2007 UTC

 }
 void
 player::disconnect ()
 {
+  if (ob)
+    {
+      ob->close_container (); //TODO: client-specific
+      ob->drop_unpaid_items ();
+    }
   if (ns)
     {
       if (active)
         INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
       ns->reset_stats ();
       ns->pl = 0;
       ns = 0;
     }
-  if (ob)
-    ob->close_container (); //TODO: client-specific
   observe = ob;
   deactivate ();
 }
   unsigned lastdist;
   rv_vector rv;
   for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
     {
-      /* We should not find free objects on this friendly list, but it
-       * does periodically happen.  Given that, lets deal with it.
-       * While unlikely, it is possible the next object on the friendly
-       * list is also free, so encapsulate this in a while loop.
-       */
-      while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
-        {
-          object *tmp = ol->ob;
-          /* Can't do much more other than log the fact, because the object
-           * itself will have been cleared.
-           */
-          LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
-               tmp->debug_desc ());
-          ol = ol->next;
-          remove_friendly_object (tmp);
-          if (!ol)
-            return op;
-        }
-      /* Remove special check for player from this.  First, it looks to cause
-       * some crashes (ol->ob->contr not set properly?), but secondly, a more
-       * complicated method of state checking would be needed in any case -
-       * as it was, a clever player could type quit, and the function would
-       * skip them over while waiting for confirmation.  Remove
-       * on_same_map check, as can_detect_enemy also does this
-       */
       if (!can_detect_enemy (mon, ol->ob, &rv))
         continue;
       if (lastdist > rv.distance)
         {
                 pick_up (op, tmp);
                 continue;
               }
           if (op->contr->mode & PU_READABLES)
-            if (tmp->type == BOOK || tmp->type == SCROLL)
+            if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
               {
                 pick_up (op, tmp);
                 continue;
               }
   arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
   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);
+  op->play_sound (sound_find ("fire_arrow"));
   m->insert (arrow, sx, sy, op);
   if (!arrow->destroyed ())
     move_arrow (arrow);
   if (item->type == WAND)
     {
       if (item->stats.food <= 0)
         {
-          play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
+          op->contr->play_sound (sound_find ("wand_poof"));
           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);
+          op->contr->play_sound (sound_find ("wand_poof"));
           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));
   /* If we found a key, do some extra work */
   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 (op->speed_left > 0.f)
         {
           --op->speed_left;
-          play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+          op->play_sound (sound_find ("push_player"));
           push_ob (mon, dir, op);
           if (op->contr->tmp_invis || op->hide)
             make_visible (op);
         {
           --op->speed_left;
           if (!op->contr->braced)
             {
-              play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+              op->play_sound (sound_find ("push_player"));
               push_ob (mon, dir, op);
             }
           else
             new_draw_info (0, 0, op, "You withhold your attack");
     return 0;
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
       {
-        play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
+        op->play_sound (sound_find ("ob_evaporate"));
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
         if (op->contr)
           esrv_del_item (op->contr, tmp->count);
 /* This goes throws the inventory and removes unpaid objects, and puts them
  * back in the map (location and map determined by values of env).  This
  * function will descend into containers.  op is the object to start the search
  * from.
  */
-void
+static void
-remove_unpaid_objects (object *op, object *env)
+drop_unpaid_items (object *op, object *env)
 {
   while (op)
     {
       object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
             esrv_del_item (env->contr, op->count);
           op->insert_at (env);
         }
       else if (op->inv)
-        remove_unpaid_objects (op->inv, env);
+        drop_unpaid_items (op->inv, env);
       op = next;
     }
+}
+void
+object::drop_unpaid_items ()
+{
+  if (!flag [FLAG_REMOVED])
+    ::drop_unpaid_items (inv, this);
 }
 /*
  * Returns pointer a static string containing gravestone text
  * Moved from apply.c to player.c - player.c is what
         }
       /* Digestion */
       if (--op->last_eat < 0)
         {
-          int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
+          int bonus   = max (0,  op->contr->digestion),
+              penalty = max (0, -op->contr->digestion);
-          if (op->contr->gen_hp > 0)
-            op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
+          op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
-          else
-            op->last_eat = 25 * (1 + bonus) / (penalty + 1);
           /* dms do not consume food */
           if (!QUERY_FLAG (op, FLAG_WIZ))
             op->stats.food--;
         }
   object *tmp;
   if (save_life (op))
     return;
   /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
    * in cities ONLY!!! It is very important that this doesn't get abused.
    * Look at op_on_battleground() for more info       --AndreasV
    */
   if (op_on_battleground (op, &x, &y))
       strcpy (op->contr->killer, "starvation");
     }
   else
     sprintf (buf, "%s died.", &op->name);
-  play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
+  op->contr->play_sound (sound_find ("player_dies"));
   /*  save the map location for corpse, gravestone */
   x   = op->x;
   y   = op->y;
   map = op->map;
   /*
    * Check to see if the player has any unpaid items. If so, remove them
    * and put them back in the map.
    */
-  remove_unpaid_objects (op->inv, op);
+  op->drop_unpaid_items ();
   /****************************************/
   /*                                      */
   /* Move player to his current respawn-  */
   /* position (usually last savebed)      */

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.153 by root, Tue Jul 10 05:51:38 2007 UTC vs. Revision 1.160 by root, Wed Aug 22 20:46:46 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.160 by root, Wed Aug 22 20:46:46 2007 UTC