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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC

 /*
  * get_nearest_part(multi-object, object 2) returns the part of the
  * multi-object 1 which is closest to the second object.
  * If it's not a multi-object, it is returned.
  */
 object *
 get_nearest_part (object *op, const object *pl)
 {
   object *tmp, *closest;
   int last_dist, i;
 }
 /*
  * Sets the owner and sets the skill and exp pointers to owner's current
  * skill and experience objects.
+ * ACTUALLY NO! investigate! TODO
  */
 void
 object::set_owner (object *owner)
 {
+  // allow objects which own objects
-  if (!owner)
+  if (owner)
-    return;
-  /* next line added to allow objects which own objects */
-  /* Add a check for ownercounts in here, as I got into an endless loop
-   * with the fireball owning a poison cloud which then owned the
-   * fireball.  I believe that was caused by one of the objects getting
-   * freed and then another object replacing it.  Since the ownercounts
-   * didn't match, this check is valid and I believe that cause is valid.
-   */
-  while (owner->owner)
+    while (owner->owner)
-    owner = owner->owner;
+      owner = owner->owner;
   this->owner = owner;
 }
 int
 object::copy_to (object *dst)
 {
   *dst = *this;
   if (speed < 0)
-    dst->speed_left = speed_left - rndm ();
+    dst->speed_left -= rndm ();
   dst->set_speed (dst->speed);
 }
 void
     return;
   if (destroy_inventory)
     destroy_inv (false);
+  if (is_head ())
+    if (sound_destroy)
-  play_sound (sound_destroy);
+      play_sound (sound_destroy);
+    else if (flag [FLAG_MONSTER])
+      play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
   attachable::destroy ();
 }
 /*
       if (map->in_memory == MAP_SAVING)
         return;
       int check_walk_off = !flag [FLAG_NO_APPLY];
+      if (object *pl = ms.player ())
+        {
+          if (pl->container == this)
+            /* If a container that the player is currently using somehow gets
+             * removed (most likely destroyed), update the player view
+             * appropriately.
+             */
+            pl->close_container ();
+          pl->contr->ns->floorbox_update ();
+        }
       for (tmp = ms.bot; tmp; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
            * being removed.
            */
-          if (tmp->type == PLAYER && tmp != this)
-            {
-              /* If a container that the player is currently using somehow gets
-               * removed (most likely destroyed), update the player view
-               * appropriately.
-               */
-              if (tmp->container == this)
-                {
-                  flag [FLAG_APPLIED] = 0;
-                  tmp->container = 0;
-                }
-              if (tmp->contr->ns)
-                tmp->contr->ns->floorbox_update ();
-            }
           /* See if object moving off should effect something */
           if (check_walk_off
               && ((move_type & tmp->move_off)
                   && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
   object *top, *floor = NULL;
   op->remove ();
-#if 0
-  if (!m->active != !op->active)
-    if (m->active)
-      op->activate_recursive ();
-    else
-      op->deactivate_recursive ();
-#endif
   if (out_of_map (m, op->x, op->y))
     {
       LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
 #ifdef MANY_CORES
       /* Better to catch this here, as otherwise the next use of this object
       op->map->touch ();
     }
   op->map->dirty = true;
-  /* If we have a floor, we know the player, if any, will be above
-   * it, so save a few ticks and start from there.
-   */
   if (!(flag & INS_MAP_LOAD))
     if (object *pl = ms.player ())
-      if (pl->contr->ns)
-        pl->contr->ns->floorbox_update ();
+      pl->contr->ns->floorbox_update ();
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really
    * an inefficient way to do this, as it means los for all players
    * on the map will get recalculated.  The players could very well
  * be != op, if items are merged. -Tero
  */
 object *
 object::insert (object *op)
 {
-  object *tmp, *otmp;
   if (!QUERY_FLAG (op, FLAG_REMOVED))
     op->remove ();
   if (op->more)
     {
       return op;
     }
   CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
   CLEAR_FLAG (op, FLAG_REMOVED);
   if (op->nrof)
     {
-      for (tmp = inv; tmp != NULL; tmp = tmp->below)
+      for (object *tmp = inv; tmp; tmp = tmp->below)
         if (object::can_merge (tmp, op))
           {
             /* return the original object and remove inserted object
                (client needs the original object) */
             tmp->nrof += op->nrof;
       add_weight (this, op->weight * op->nrof);
     }
   else
     add_weight (this, (op->weight + op->carrying));
-  otmp = this->in_player ();
+  if (object *otmp = this->in_player ())
-  if (otmp && otmp->contr)
-    if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+    if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
       otmp->update_stats ();
+  op->owner = 0; // its his/hers now. period.
-  op->map = 0;
+  op->map   = 0;
-  op->env = this;
+  op->env   = this;
   op->above = 0;
   op->below = 0;
-  op->x = 0, op->y = 0;
+  op->x = op->y = 0;
   /* reset the light list and los of the players on the map */
-  if ((op->glow_radius != 0) && map)
+  if (op->glow_radius && map)
     {
 #ifdef DEBUG_LIGHTS
       LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
 #endif /* DEBUG_LIGHTS */
       if (map->darkness)
  * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
  * core dumps if they do.
  *
  * Add a check so we can't pick up invisible objects (0.93.8)
  */
 int
 can_pick (const object *who, const object *item)
 {
   return                        /*QUERY_FLAG(who,FLAG_WIZ)|| */
     (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
                  &name,
                  title ? "\",title:\"" : "",
                  title ? (const char *)title : "",
                  flag_desc (flagdesc, 512), type);
-  if (env)
+  if (!this->flag[FLAG_REMOVED] && env)
     p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
   if (map)
     p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
       old_container->flag [FLAG_APPLIED] = 0;
       container = 0;
       esrv_update_item (UPD_FLAGS, this, old_container);
       new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+      play_sound (sound_find ("chest_close"));
     }
   if (new_container)
     {
       if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
       new_container->flag [FLAG_APPLIED] = 1;
       container = new_container;
       esrv_update_item (UPD_FLAGS, this, new_container);
       esrv_send_inventory (this, new_container);
+      play_sound (sound_find ("chest_open"));
     }
 }
 object *
 object::force_find (const shstr name)
   force->flag [FLAG_APPLIED]    = true;
   insert (force);
 }
+void
+object::play_sound (faceidx sound) const
+{
+  if (!sound)
+    return;
+  if (flag [FLAG_REMOVED])
+    return;
+  if (env)
+    {
+      if (object *pl = in_player ())
+        pl->contr->play_sound (sound);
+    }
+  else
+    map->play_sound (sound, x, y);
+}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs. Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC