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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.99 by sf-marcmagus, Fri Oct 16 16:29:47 2009 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
 /*
  * Object (handling) commands
  */
 #include <global.h>
-#include <loader.h>
 #include <skills.h>
 #include <sproto.h>
 #include <living.h>
-#include <math.h>
 /*
  * Object id parsing functions
  */
   skill = find_skill_by_name_fuzzy (pl, params);
   if (!skill)
     {
-      new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
+      new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
       return 0;
     }
-  pl->change_skill (0);
+  pl->apply (skill);
-  apply_special (pl, skill, AP_APPLY);
   return 1;
 }
 /* A little special because we do want to pass the full params along
  * as it includes the object to throw.
 command_throw (object *op, char *params)
 {
   if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
     return do_skill (op, op, skop, op->facing, params);
   else
-    new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
+    new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
   return 0;
 }
 int
       while (*params == ' ')
         params++;
       if (object *inv = find_best_apply_object_match (op, params, aflag))
-        player_apply (op, inv, aflag, 0);
+        op->apply (inv, aflag);
       else
-        new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
+        op->failmsgf ("Could not find any match to the %s.", params);
     }
   return 0;
 }
       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));
+      new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
       return 0;
     }
   if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
     {
     count = tmp->nrof;
   /* container is open, so use it */
   if (tmp->flag [FLAG_STARTEQUIP])
     alt = op;
-  else if (op->container)
+  else if ((alt = op->container_ ()))
     {
-      alt = op->container;
       if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
         goto leave;
     }
   else
     {                           /* non container pickup */
 int
 command_take (object *op, char *params)
 {
   object *tmp, *next;
-  if (op->container)
+  if (op->container_ ())
-    tmp = op->container->inv;
+    tmp = op->container_ ()->inv;
   else
     {
       tmp = op->above;
       if (tmp)
         while (tmp->above)
   /* Makes processing easier */
   if (params && *params == '\0')
     params = 0;
-  int cnt = MAX_ITEM_PER_DROP;
+  int cnt = MAX_ITEM_PER_ACTION;
   while (tmp)
     {
       next = tmp->below;
       for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
         {
           tmp = tmp2->below;
-          if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
+          if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
             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);
    */
   if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
     return;
   if (QUERY_FLAG (tmp, FLAG_APPLIED))
-    if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
+    if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
       return;
   /* we want to put some portion of the item into the container */
   if (!can_split (op, tmp, nrof))
     return;
   new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
   sack->insert (tmp);
-}
-/*
- *  This function was part of drop, now is own function.
- *  Player 'op' tries to drop object 'tmp', if tmp is non zero, then
- *  nrof objects is tried to dropped.
- * This is used when dropping objects onto the floor.
- */
-void
-drop_object (object *op, object *tmp, uint32 nrof)
-{
-  if (QUERY_FLAG (tmp, FLAG_NO_DROP))
-    return;
-  if (QUERY_FLAG (tmp, FLAG_APPLIED))
-    if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
-      return;                   /* can't unapply it */
-  /* We are only dropping some of the items.  We split the current object
-   * off
-   */
-  if (!can_split (op, tmp, nrof))
-    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.
       return;
   if (obj->destroyed () || obj->is_inserted ())
     return;
-  if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
+  if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
     if (!sell_item (obj, dropper))
       return;
+  if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
+    return;
   /* If nothing special happened with this object, the default action is to
    * insert it below the dropper:
    */
   obj->x = dropper->x;
   obj->y = dropper->y;
   insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
+}
+/*
+ * This function was part of drop, now is own function.
+ * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
+ * nrof objects are tried to drop.
+ * This is used when dropping objects onto the floor.
+ */
+void
+drop_object (object *op, object *tmp, uint32 nrof)
+{
+  if (QUERY_FLAG (tmp, FLAG_NO_DROP))
+    return;
+  if (QUERY_FLAG (tmp, FLAG_APPLIED))
+    if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
+      return;                   /* can't unapply it */
+  /* We are only dropping some of the items.  We split the current object
+   * off
+   */
+  if (!can_split (op, tmp, nrof))
+    return;
+  drop_object (op, tmp);
+  if (!tmp->destroyed () && !tmp->is_inserted ())
+    {
+      // if nothing happened with the object we give it back
+      op->insert (tmp);
+    }
 }
 void
 drop (object *op, object *tmp)
 {
            */
           tmp->destroy ();
           return;
         }
       else
-        {
-          while (tmp && tmp->invisible)
+        while (tmp && tmp->invisible)
-            tmp = tmp->below;
+          tmp = tmp->below;
-        }
     }
-  if (tmp == NULL)
+  if (!tmp)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
       return;
     }
   if (op->type == PLAYER && op->contr->last_used == tmp)
     op->contr->last_used = tmp->below ? tmp->below
                          : tmp->above ? tmp->above
                          : (object *)0;
-  if (op->container)
+  if (op->container_ ())
     {
       if (op->type == PLAYER)
-        put_object_in_sack (op, op->container, tmp, op->contr->count);
+        put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
       else
-        put_object_in_sack (op, op->container, tmp, 0);
+        put_object_in_sack (op, op->container_ (), tmp, 0);
     }
   else
     {
       if (op->type == PLAYER)
         drop_object (op, tmp, op->contr->count);
   /*
      Care must be taken that the next item pointer is not to money as
      the drop() routine will do unknown things to it when dropping
      in a shop. --Tero.Pelander@utu.fi
    */
-  int cnt = MAX_ITEM_PER_DROP;
+  int cnt = MAX_ITEM_PER_ACTION;
   if (!params)
     {
       while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
-          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
+          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
-              curinv->type != FOOD && curinv->type != KEY &&
+              && curinv->type != MONEY
-              curinv->type != SPECIAL_KEY && curinv->type != GEM &&
+              && curinv->type != FOOD
+              && curinv->type != KEY
+              && curinv->type != SPECIAL_KEY
+              && curinv->type != GEM
+              && !curinv->invisible
-              !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
+              && (curinv->type != CONTAINER || op->container_ () != curinv))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
  * <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
+static bool
 drop_vector (object *dropper, vector<object *> &objs, int *cnt)
 {
   vector<object *>::iterator i;
   bool did_one = false;
           if (item_matched_string (op, tmp, params))
             matched_objs.push_back (tmp);
         }
-      int cnt = MAX_ITEM_PER_DROP;
+      int cnt = MAX_ITEM_PER_ACTION;
       if (!drop_vector (op, matched_objs, &cnt))
         new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
       if (cnt <= 0)
 {
   new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
 }
 static void
-describe_dump_object (dynbuf &buf, object *ob)
-{
-  char *txt = dump_object (ob);
-  for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
-  buf << "\n" << txt << "\n";
-  if (!ob->is_arch ())
-    describe_dump_object (buf, ob->arch);
-}
-std::string
-object::describe (object *who)
-{
-  dynbuf_text buf (1024, 1024);
-  buf.printf ("That is: %s.\r", long_desc (who).c_str ());
-  if (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 level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
-        break;
-      case BOOK:
-        if (msg)
-          buf << "Something is written in it.\r";
-        break;
-      case CONTAINER:
-        if (race)
-          {
-            if (weight_limit && stats.Str < 100)
-              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.\r", &race);
-          }
-        else if (weight_limit && stats.Str < 100)
-          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.\r", stats.food);
-        break;
-    }
-  if (materialname && !msg)
-    buf << (nrof > 1 ? "They are made of " : "It is made of ")
-        << materialname
-        << '\r';
-  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 << ".\r";
-        }
-  if (weight)
-    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.\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.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
-          else
-            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.\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)
-    {
-      if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
-        {
-          buf << '\r';
-          /* 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:\r";
-          buf << msg << '\n';
-        }
-    }
-  else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
-           && (type == SPELLBOOK || type == ROD || type == WAND
-               || type == ROD || type == POTION || type == SCROLL))
-    // for spellbooks and other stuff that contains spells, print the spell message,
-    // unless the object has a custom message handled above.
-    buf << '\r' << inv->msg << '\n';
-  // try to display the duration for some potions and scrolls
-  // this includes change ability potions and group spells,
-  // but does not handle protection potions
-  if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
-      && (type == POTION || type == SCROLL))
-    {
-      object *spell = inv;
-      if (spell->subtype == SP_PARTY_SPELL)
-        spell = spell->other_arch;
-      if (spell->subtype == SP_CHANGE_ABILITY)
-        buf.printf ("\nH<The effect will last about %.10g seconds.>",
-                    TICK2TIME (change_ability_duration (spell, this)));
-    }
-  // Display a hint about inscribable items [empty books]
-  // This includes the amount of text they can hold.
-  if (type == INSCRIBABLE)
-    {
-      if (other_arch && other_arch->type == SCROLL)
-        buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
-      else
-        buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
-                    weight_limit);
-    }
-  buf << '\n';
-  // the dungeon master additionally gets a complete dump
-  if (who && who->flag [FLAG_WIZLOOK])
-    {
-      buf << "\nT<Object>\n";
-      describe_dump_object (buf, this);
-      if (inv)
-        {
-          buf << "\nT<Top Inventory>\n";
-          describe_dump_object (buf, inv);
-        }
-    }
-  return std::string (buf.linearise (), buf.size ());
-}
-static void
 display_new_pickup (object *op)
 {
   int i = op->contr->mode;
   new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
 }
 int
 command_search_items (object *op, char *params)
 {
-  char buf[MAX_BUF];
   if (params == NULL)
     {
       if (op->contr->search_str[0] == '\0')
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
           return 1;
         }
       op->contr->search_str[0] = '\0';
       new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
-      op->update_stats ();
+      op->contr->queue_stats_update ();
       return 1;
     }
-  if (strlen (params) >= MAX_BUF)
+  if (strlen (params) >= sizeof (op->contr->search_str))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
       return 1;
     }
   strcpy (op->contr->search_str, params);
-  sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
+  new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
-  new_draw_info (NDI_UNIQUE, 0, op, buf);
+  op->contr->queue_stats_update ();
-  op->update_stats ();
   return 1;
 }
+int
+command_unlock (object *op, char *params)
+{
+  /* if the unlock command typed with nothing, unlock everything,
+   * this might be bad
+   */
+  if (params == NULL)
+    {
+      for (object *item = op->inv; item; item = item->below)
+        {
+          CLEAR_FLAG(item, FLAG_INV_LOCKED);
+          //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
+          esrv_update_item (UPD_FLAGS, op, item);
+        }
+      return 0;
+    }
+  /* if the unlock command is used with a param,
+   * unlock what matches. i.e. unlock material, should unlock all the materials
+   */
+  for (object *item = op->inv; item; item = item->below)
+    if (item->name.contains (params))
+      {
+        CLEAR_FLAG (item, FLAG_INV_LOCKED);
+        //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
+        esrv_update_item (UPD_FLAGS, op, item);
+      }
+  return 0;
+}
+int
+command_lock (object *op, char *params)
+{
+  /* if the lock command is typed by itself, lock everything
+   */
+  if (params == NULL)
+    {
+      for (object *item = op->inv; item; item = item->below)
+        {
+          SET_FLAG (item, FLAG_INV_LOCKED);
+          //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
+          esrv_update_item (UPD_FLAGS, op, item);
+        }
+      return 0;
+    }
+  /* if the lock command is used with a param, lock what matches.
+   * i.e. lock material, should lock all the materials
+   */
+  for (object *item = op->inv; item; item = item->below)
+    if (item->name.contains (params))
+      {
+        SET_FLAG (item, FLAG_INV_LOCKED);
+        //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
+        esrv_update_item (UPD_FLAGS, op, item);
+      }
+  return 0;
+}
+/* op should be a player, params is any params.
+ * If no params given, we print out the currently marked object.
+ * otherwise, try to find a matching object - try best match first.
+ */
+int
+command_mark (object *op, char *params)
+{
+  if (!params)
+    {
+      if (object *mark = find_marked_object (op))
+        op->statusmsg (format ("%s is marked.", query_name (mark)));
+      else
+        op->failmsg ("You have no marked object.");
+    }
+  else
+    {
+      if (object *mark = find_best_object_match (op, params))
+        {
+          op->contr->mark = mark;
+          op->statusmsg (format ("Marked item %s", query_name (mark)));
+        }
+      else
+        op->failmsgf ("Could not find an object that matches %s", params);
+    }
+  return 0;                     /*shouldnt get here */
+}

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.99 by sf-marcmagus, Fri Oct 16 16:29:47 2009 UTC vs. Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.99 by sf-marcmagus, Fri Oct 16 16:29:47 2009 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC