[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.65 by root, Sun Apr 20 18:48:51 2008 UTC vs.
Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC

 find_best_object_match (object *pl, const char *params)
 {
   return find_best_apply_object_match (pl, params, AP_TOGGLE);
 }
+static bool
+can_split (object *pl, object *&op, sint32 nrof)
+{
+  if (object *tmp = op->split (nrof))
+    {
+      op = tmp;
+      return true;
+    }
+  else
+    {
+      new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %ss.", op->number_of (), &op->name);
+      return false;
+    }
+}
 int
 command_uskill (object *pl, char *params)
 {
   if (!params)
     {
  * not need to use split_ob and stuff.
  */
 int
 sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
 {
   if (!QUERY_FLAG (sack, FLAG_APPLIED))
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
       return 0;
     }
   if (sack == op)
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
       return 0;
     }
   if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
       return 0;
     }
   if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
       return 0;
     }
   if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
                                       (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
                                       * (100 - sack->stats.Str) / 100) > sack->weight_limit)
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
       return 0;
     }
   /* All other checks pass, must be OK */
   return 1;
 }
 /* Pick up commands follow */
 static void
 pick_up_object (object *pl, object *op, object *tmp, int nrof)
 {
   object *env = tmp->env;
   uint32 weight, effective_weight_limit;
-  int tmp_nrof = tmp->nrof ? tmp->nrof : 1;
+  int tmp_nrof = tmp->number_of ();
   /* IF the player is flying & trying to take the item out of a container
    * that is in his inventory, let him.  tmp->env points to the container
    * (sack, luggage, etc), tmp->env->env then points to the player (nested
    * containers not allowed as of now)
     {
       new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
       return;
     }
-  if (nrof != tmp_nrof)
+  if (!can_split (pl, tmp, nrof))
-    {
-      object *tmp2 = tmp;
-      tmp = get_split_ob (tmp, nrof);
-      if (!tmp)
-        {
-          new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
-          return;
+    return;
-        }
-      /* Tell the client what happened to the rest of objects */
-      if (pl->contr)
-        if (tmp2->destroyed ())
-          esrv_del_item (pl->contr, tmp2->count);
-        else
-          esrv_update_item (UPD_NROF, pl, tmp2);
-    }
-  else
-    {
-      /* If the object is in a container, send a delete to the client.
-       * - we are moving all the items from the container to elsewhere,
-       * so it needs to be deleted.
-       */
-      if (!QUERY_FLAG (tmp, FLAG_REMOVED))
-        {
-          if (tmp->env && pl->type == PLAYER)
-            esrv_del_item (pl->contr, tmp->count);
-          tmp->remove ();      /* Unlink it */
-        }
-    }
   if (QUERY_FLAG (tmp, FLAG_UNPAID))
     new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
   else
     new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
         new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
     }
   return 0;
 }
 /*
  *  This function was part of drop, now is own function.
  *  Player 'op' tries to put object 'tmp' into sack 'sack',
  *  if nrof is non zero, then nrof objects is tried to put into sack.
       return;
     }
   if (tmp->type == CONTAINER && tmp->inv)
     {
       /* Eneq(@csd.uu.se): If the object to be dropped is a container
        * we instead move the contents of that container into the active
        * container, this is only done if the object has something in it.
        */
       sack2 = tmp;
       return;
   /* we want to put some portion of the item into the container */
   if (nrof && tmp->nrof != nrof)
     {
-      object *tmp2 = tmp;
+      if (!can_split (op, tmp, nrof))
-      tmp = get_split_ob (tmp, nrof);
-      if (!tmp)
-        {
-          new_draw_info (NDI_UNIQUE, 0, op, errmsg);
-          return;
+        return;
-        }
-      /* Tell a client what happened other objects */
-      if (tmp2->destroyed ())
-        esrv_del_item (op->contr, tmp2->count);
-      else                      /* this can proably be replaced with an update */
-        esrv_send_item (op, tmp2);
     }
   else
     tmp->remove ();
   new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
   /* We are only dropping some of the items.  We split the current object
    * off
    */
   if (nrof && tmp->nrof != nrof)
     {
-      object *tmp2 = tmp;
+      if (!can_split (op, tmp, nrof))
-      tmp = get_split_ob (tmp, nrof);
-      if (!tmp)
-        {
-          new_draw_info (NDI_UNIQUE, 0, op, errmsg);
-          return;
+        return;
-        }
-      /* Tell a client what happened rest of objects.  tmp2 is now the
-       * original object
-       */
-      if (op->type == PLAYER)
-        {
-          if (tmp2->destroyed ())
-            esrv_del_item (op->contr, tmp2->count);
-          else
-            esrv_send_item (op, tmp2);
-        }
     }
   else
     tmp->remove ();
   if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.65 by root, Sun Apr 20 18:48:51 2008 UTC vs. Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.65 by root, Sun Apr 20 18:48:51 2008 UTC vs.
Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC