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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.83 by root, Tue Oct 14 20:11:22 2008 UTC

   return 0;
 }
 /*
- *  This function was part of drop, now is own function.
+ * This function was part of drop, now is own function.
- *  Player 'op' tries to put object 'tmp' into sack 'sack',
+ * Player 'op' tries to put object 'tmp' into sack 'sack',
- *  if nrof is non zero, then nrof objects is tried to put into sack.
+ * if nrof is non zero, then nrof objects is tried to put into sack.
+ *
  * Note that the 'sack' in question can now be a transport,
  * so this function isn't named very good anymore.
  */
 void
 put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
   /* We are only dropping some of the items.  We split the current object
    * off
    */
   if (!can_split (op, tmp, nrof))
-  if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
     return;
+  drop_object (op, tmp);
+  if (!tmp->destroyed () && !tmp->is_inserted ())
+    {
+      // if nothing happened with the object we give it back
+      op->insert (tmp);
+    }
+}
+/* In contrast to drop_object (op, tmp, nrof) above this function takes the
+ * already split off object, and feeds it to the event handlers and does
+ * other magic with it.
+ *
+ * <droppper> is the object that dropped this object and <obj> is the
+ * object that was dropped.
+ *
+ * Make sure to check what happened with <obj> after this function returns!
+ * Otherwise you may leak this object.
+ */
+void
+drop_object (object *dropper, object *obj)
+{
+  if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
+    return;
+  if (obj->destroyed () || obj->is_inserted ())
+    return;
-  if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
+  if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
     {
-      op->statusmsg (format ("You drop the %s.", query_name (tmp)));
+      dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
-      op->statusmsg ("The gods who lent it to you retrieves it.");
+      dropper->statusmsg ("The god who lent it to you retrieves it.");
-      tmp->destroy ();
+      obj->destroy ();
-      op->update_stats ();
+      dropper->update_stats ();
       return;
     }
-  /* Call this before we update the various windows/players.  At least
+  for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
-   * that we, we know the weight is correct.
+       floor;
+       floor = floor->above)
+    if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
+      return;
+  if (obj->destroyed () || obj->is_inserted ())
+    return;
+  if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
+    if (!sell_item (obj, dropper))
+      return;
+  /* If nothing special happened with this object, the default action is to
+   * insert it below the dropper:
    */
-  // 2007-11-26: moved op->update_stats away and calling it later after
-  //             all items of a drop command have been processed.
-  for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
+  obj->x = dropper->x;
-    if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
+  obj->y = dropper->y;
-      return;
-  if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
-    {
-      if (!sell_item (tmp, op))
-        return; // if we can't sell it we don't drop it
-    }
-  tmp->x = op->x;
-  tmp->y = op->y;
-  insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
+  insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
 }
 void
 drop (object *op, object *tmp)
 {
       if (tmp->env && tmp->env->type != PLAYER)
         {
           /* Just toss the object - probably shouldn't be hanging
            * around anyways
            */
-          tmp->remove ();
           tmp->destroy ();
           return;
         }
       else
         {
 /*  draw_look(op);*/
   return 0;
 }
+/* This function tries to drop all objects in the <objs> vector.
+ * <dropper> is the object that wants to drop them.
+ * <cnt> can be a 0 pointer or a pointer to the maximum number of
+ * drop operations to perform.
+ *
+ * Returns true if at least one item was dropped.
+ */
+bool
+drop_vector (object *dropper, vector<object *> &objs, int *cnt)
+{
+  vector<object *>::iterator i;
+  bool did_one = false;
+  for (i = objs.begin (); i != objs.end (); i++)
+    {
+      drop (dropper, *i);
+      if (cnt && --*cnt <= 0) break;
+      did_one = true;
+    }
+  return did_one;
+}
 /* Object op wants to drop object(s) params.  params can be a
  * comma seperated list.
  */
 int
 command_drop (object *op, char *params)
       new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
       return 0;
     }
   else
     {
-      int cnt = MAX_ITEM_PER_DROP;
+      vector<object *> matched_objs;
       for (tmp = op->inv; tmp; tmp = next)
         {
           next = tmp->below;
           if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
             continue;
           if (item_matched_string (op, tmp, params))
-            {
+            matched_objs.push_back (tmp);
-              drop (op, tmp);
-              if (--cnt <= 0) break;
-              did_one = 1;
-            }
+        }
-        }
-      if (!did_one)
+      int cnt = MAX_ITEM_PER_DROP;
+      if (!drop_vector (op, matched_objs, &cnt))
         new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
       if (cnt <= 0)
         op->failmsg ("Only dropped some items, can't drop that many items at once.");
     }
   dynbuf_text buf (512, 512);
   object *mon = head ? head : this;
   if (QUERY_FLAG (mon, FLAG_UNDEAD))
-    buf << " - It is an undead force.\n";
+    buf << "It is an undead force.\r";
   if (mon->level > who->level)
-    buf << " - It is likely more powerful than you.\n";
+    buf << "It is likely more powerful than you.\r";
   else if (mon->level < who->level)
-    buf << " - It is likely less powerful than you.\n";
+    buf << "It is likely less powerful than you.\r";
   else
-    buf << " - It is probably as powerful as you.\n";
+    buf << "It is probably as powerful as you.\r";
   if (mon->attacktype & AT_ACID)
-    buf << " - You seem to smell an acrid odor.\n";
+    buf << "You seem to smell an acrid odor.\r";
   /* Anyone know why this used to use the clone value instead of the
    * maxhp field?  This seems that it should give more accurate results.
    */
   switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
     {                           /* From 1-4 */
       case 1:
-        buf <<  " - It is in a bad shape.\n";
+        buf <<  "It is in a bad shape.\r";
         break;
       case 2:
-        buf <<  " - It is hurt.\n";
+        buf <<  "It is hurt.\r";
         break;
       case 3:
-        buf <<  " - It is somewhat hurt.\n";
+        buf <<  "It is somewhat hurt.\r";
         break;
       case 4:
-        buf <<  " - It is in excellent shape.\n";
+        buf <<  "It is in excellent shape.\r";
         break;
     }
   if (present_in_ob (POISONING, mon))
-    buf << " - It looks very ill.\n";
+    buf << "It looks very ill.\r";
+  buf << '\n';
   return buf;
 }
 /* tmp is the object being described, pl is who is examing it. */
 std::string
 object::describe (object *who)
 {
   dynbuf_text buf (1024, 1024);
-  buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
+  buf.printf ("That is: %s.\r", long_desc (who).c_str ());
   if (custom_name)
-    buf.printf ("You call it %s.\n\n", &custom_name);
+    buf.printf ("You call it %s.\r", &custom_name);
   switch (type)
     {
       case SPELLBOOK:
         if (flag [FLAG_IDENTIFIED] && inv)
-          buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
+          buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
         break;
       case BOOK:
         if (msg)
-          buf << "Something is written in it.\n";
+          buf << "Something is written in it.\r";
         break;
       case CONTAINER:
-        if (race != NULL)
+        if (race)
           {
             if (weight_limit && stats.Str < 100)
-              buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
+              buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
                           &race, weight_limit / (10.0 * (100 - stats.Str)));
             else
-              buf.printf ("It can hold only %s.\n", &race);
+              buf.printf ("It can hold only %s.\r", &race);
           }
         else if (weight_limit && stats.Str < 100)
-          buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
+          buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
         break;
       case WAND:
         if (flag [FLAG_IDENTIFIED])
-          buf.printf ("It has %d charges left.\n", stats.food);
+          buf.printf ("It has %d charges left.\r", stats.food);
         break;
     }
   if (materialname && !msg)
-    buf.printf ("It is made of: %s.\n", &materialname);
+    buf.printf ("It is made of: %s.\r", &materialname);
   if (who)
     /* Where to wear this item */
     for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
       if (slot[i].info)
           buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
           if (slot[i].info < -1 && who->slot[i].info)
             buf.printf ("(%d)", -slot[i].info);
-          buf << ".\n";
+          buf << ".\r";
         }
   if (weight)
-    buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
+    buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
   if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
     {
-      buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
+      buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
       if (is_in_shop (who))
         {
           if (flag [FLAG_UNPAID])
-            buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
+            buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
           else
-            buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
+            buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
         }
     }
   if (flag [FLAG_MONSTER])
     buf << describe_monster (who);
   /* Is this item buildable? */
   if (flag [FLAG_IS_BUILDABLE])
-    buf << "This is a buildable item.\n";
+    buf << "This is a buildable item.\r";
   /* Does the object have a message?  Don't show message for all object
    * types - especially if the first entry is a match
    */
   if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
     {
       /* This is just a hack so when identifying the items, we print
        * out the extra message
        */
       if (need_identify (this) && flag [FLAG_IDENTIFIED])
-        buf << "The object has a story:\n\n";
+        buf << "The object has a story:\r";
       buf << msg << '\n';
     }
   buf << '\n';

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs. Revision 1.83 by root, Tue Oct 14 20:11:22 2008 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.83 by root, Tue Oct 14 20:11:22 2008 UTC