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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 }
 static bool
 can_split (object *pl, object *&op, sint32 nrof)
 {
-  if (object *tmp = op->split (nrof))
+  if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
     {
       op = tmp;
       return true;
     }
   else
     {
+      if (op->nrof > 1)
-      new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %ss.", op->number_of (), &op->name);
+        new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
+      else
+        new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
       return false;
     }
 }
 int
    * (sack, luggage, etc), tmp->env->env then points to the player (nested
    * containers not allowed as of now)
    */
   if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
     {
-      new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");
+      pl->failmsg ("You are levitating, you can't reach the ground! "
+                   "H<You have to stop levitating first, if you can, either by using your levitation skill, "
+                   "or waiting till the levitation effect wears off.>");
       return;
     }
   if (QUERY_FLAG (tmp, FLAG_NO_DROP))
     return;
-  if (nrof > tmp_nrof || nrof == 0)
+  if (nrof > tmp_nrof || nrof <= 0)
     nrof = tmp_nrof;
   /* Figure out how much weight this object will add to the player */
   weight = tmp->weight * nrof;
   if (tmp->inv)
   if (!can_split (pl, tmp, nrof))
     return;
   if (QUERY_FLAG (tmp, FLAG_UNPAID))
+    {
+      tmp->flag.reset (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));
+      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));
+      tmp->flag.set (FLAG_UNPAID);
+    }
   else
     new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
-  tmp = insert_ob_in_ob (tmp, op);
+  op->insert (tmp);
-  /* All the stuff below deals with client/server code, and is only
-   * usable by players
-   */
-  if (pl->contr)
-    {
-      esrv_send_item (pl, tmp);
-      /* These are needed to update the weight for the container we
-       * are putting the object in.
-       */
-      if (op != pl)
-        {
-          esrv_update_item (UPD_WEIGHT, pl, op);
-          esrv_send_item (pl, pl);
-        }
-      /* Update the container the object was in */
-      if (env && env != pl && env != op)
-        esrv_update_item (UPD_WEIGHT, pl, env);
-    }
 }
 /* modified slightly to allow monsters use this -b.t. 5-31-95 */
 void
 pick_up (object *op, object *alt)
        * but that probably will make it more difficult to read, and
        * not make it any more efficient
        */
       if (params && item_matched_string (op, tmp, params))
         {
+          if (--cnt < 0) break;
           pick_up (op, tmp);
-          if (--cnt <= 0) break;
         }
       else if (can_pick (op, tmp) && !params)
         {
+          if (--cnt < 0) break;
           pick_up (op, tmp);
           break;
         }
       tmp = next;
     }
-  if (cnt <= 0)
+  if (cnt < 0)
     {
       op->failmsg ("Couldn't pick up so many items at once.");
       return 0;
     }
       for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
         {
           tmp = tmp2->below;
           if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
-            {
-              put_object_in_sack (op, sack, tmp2, 0);
+            put_object_in_sack (op, sack, tmp2, 0);
-            }
           else
             {
               sprintf (buf, "Your %s fills up.", query_name (sack));
               new_draw_info (NDI_UNIQUE, 0, op, buf);
               break;
             }
         }
-      esrv_update_item (UPD_WEIGHT, op, sack2);
       return;
     }
   /* Don't worry about this for containers - our caller should have
    * already checked this.
   if (QUERY_FLAG (tmp, FLAG_APPLIED))
     if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
       return;
   /* we want to put some portion of the item into the container */
-  if (nrof && tmp->nrof != nrof)
-    {
-      if (!can_split (op, tmp, nrof))
+  if (!can_split (op, tmp, nrof))
-        return;
+    return;
-    }
-  else
-    tmp->remove ();
   new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
-  tmp2 = insert_ob_in_ob (tmp, sack);
+  sack->insert (tmp);
-  // elmex: 2007-11-26: removed update_stats and replaced
-  //                    it by update_after_inventory_change () in the caller
-  //                    of this function
-  /* If an object merged (and thus, different object), we need to
-   * delete the original.
-   */
-  if (tmp2 != tmp)
-    esrv_del_item (op->contr, tmp->count);
-  esrv_send_item (op, tmp2);
-  /* update the sacks weight */
-  esrv_update_item (UPD_WEIGHT, op, sack);
 }
 /*
  *  This function was part of drop, now is own function.
  *  Player 'op' tries to drop object 'tmp', if tmp is non zero, then
  * This is used when dropping objects onto the floor.
  */
 void
 drop_object (object *op, object *tmp, uint32 nrof)
 {
-  object *floor;
   if (QUERY_FLAG (tmp, FLAG_NO_DROP))
     return;
   if (QUERY_FLAG (tmp, FLAG_APPLIED))
     if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
   //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
   /* We are only dropping some of the items.  We split the current object
    * off
    */
-  if (nrof && tmp->nrof != nrof)
-    {
-      if (!can_split (op, tmp, nrof))
+  if (!can_split (op, tmp, nrof))
-        return;
+    return;
-    }
-  else
-    tmp->remove ();
   if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
     return;
   if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
     {
       op->statusmsg (format ("You drop the %s.", query_name (tmp)));
-      op->statusmsg ("The gods who lent it to you retrieves it.");
+      op->statusmsg ("The god who lent it to you retrieves it.");
-      if (op->type == PLAYER)
-        esrv_del_item (op->contr, tmp->count);
       tmp->destroy ();
       op->update_stats ();
       return;
     }
-  if (op->type == PLAYER)
-    esrv_del_item (op->contr, tmp->count);
   /* Call this before we update the various windows/players.  At least
    * that we, we know the weight is correct.
    */
   // 2007-11-26: moved op->update_stats away and calling it later after
   //             all items of a drop command have been processed.
-  for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
+  for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
     if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
       return;
   if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
+    {
-    sell_item (tmp, op);
+      if (!sell_item (tmp, op))
+        {
+          // if we can't sell it we don't drop it, so give it back to the seller
+          op->insert (tmp);
+          return;
+        }
+    }
   tmp->x = op->x;
   tmp->y = op->y;
   insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
-}
-void update_after_inventory_change (object *op)
-{
-  /* Call this before we update the various windows/players.  At least
-   * that we, we know the weight is correct.
-   */
-  op->update_stats ();
-  // elmex: kept this for now, i have no idea what happens when i remove it:
-  if (op->type == PLAYER)
-    {
-      /* Need to update the weight for the player */
-      esrv_send_item (op, op);
-      op->contr->ns->floorbox_update ();
-    }
 }
 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
         {
-          while (tmp != NULL && tmp->invisible)
+          while (tmp && tmp->invisible)
             tmp = tmp->below;
         }
     }
   if (tmp == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
       return;
     }
   if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
       return;
     }
   if (QUERY_FLAG (tmp, FLAG_NO_DROP))
     {
 #if 0
       /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
       new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
   if (op->type == PLAYER)
     op->contr->count = 0;
 }
 /* Command will drop all items that have not been locked */
 int
 command_dropall (object *op, char *params)
 {
-  object *curinv, *nextinv;
   if (op->inv == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
       return 0;
     }
-  curinv = op->inv;
+  object *curinv = op->inv;
+  object *nextinv;
   /*
      This is the default.  Drops everything not locked or considered
      not something that should be dropped.
    */
      in a shop. --Tero.Pelander@utu.fi
    */
   int cnt = MAX_ITEM_PER_DROP;
-  if (params == NULL)
+  if (!params)
     {
-      while (curinv != NULL)
+      while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
           if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
               curinv->type != FOOD && curinv->type != KEY &&
               curinv->type != SPECIAL_KEY && curinv->type != GEM &&
               !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           curinv = nextinv;
         }
     }
   else if (strcmp (params, "weapons") == 0)
     {
-      while (curinv != NULL)
+      while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
           if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           curinv = nextinv;
         }
     }
   else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
     {
-      while (curinv != NULL)
+      while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
           if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           curinv = nextinv;
         }
     }
   else if (strcmp (params, "misc") == 0)
     {
-      while (curinv != NULL)
+      while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
           if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
             {
               switch (curinv->type)
                 {
                   case HORN:
                     break;
                   default:
                     curinv = nextinv;
                     break;
                 }
               if (--cnt <= 0) break;
             }
           curinv = nextinv;
         }
     }
   if (cnt <= 0)
     op->failmsg ("Only dropped some items, can't drop that many items at once.");
-  update_after_inventory_change (op);
 /*  draw_look(op);*/
   return 0;
 }
 /* Object op wants to drop object(s) params.  params can be a
  * comma seperated list.
  */
 int
 command_drop (object *op, char *params)
 {
   object *tmp, *next;
   int did_one = 0;
       if (!did_one)
         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.");
-      update_after_inventory_change (op);
     }
   return 0;
 }
   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", 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", &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 && *msg != '@')
+  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";
+        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.66 by root, Mon Apr 21 07:01:40 2008 UTC vs. Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC