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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.107 by elmex, Fri Nov 13 15:41:39 2009 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 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,2011,2012,2013,2014,2015,2016 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*
  * Object (handling) commands
  */
 #include <global.h>
-#include <loader.h>
 #include <skills.h>
 #include <sproto.h>
 #include <living.h>
 /*
       int tmpmatch = item_matched_string (pl, tmp, params);
       if (tmpmatch > match_val)
         {
-          if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
+          if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
             continue;
-          if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
+          if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
             continue;
           match_val = tmpmatch;
           best = tmp;
         }
   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.
  */
 int
 command_throw (object *op, char *params)
 {
-  if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
+  if (object *skop = find_skill_by_name (op, shstr_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;
 }
  * 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))
+  if (!sack->flag [FLAG_APPLIED])
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
       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)
     {
       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) *
+  if (sack->weight_limit
+      && weight_t (sack->carrying
+                   + sack->number_of ()
-                                      (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
+                     * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
-                                      * (100 - sack->stats.Str) / 100) > sack->weight_limit)
+                     * (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;
     }
 }
 /* Pick up commands follow */
 /* pl = player (not always - monsters can use this now)
  * op is the object to put tmp into,
  * tmp is the object to pick up, nrof is the number to
  * pick up (0 means all of them)
  */
 static void
 pick_up_object (object *pl, object *op, object *tmp, int nrof)
 {
-  object *env = tmp->env;
-  uint32 weight, effective_weight_limit;
+  weight_t weight, effective_weight_limit;
   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)
    */
-  if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
+  if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
     {
       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))
+  if (tmp->flag [FLAG_NO_DROP])
     return;
   if (nrof > tmp_nrof || nrof <= 0)
     nrof = tmp_nrof;
     }
   if (!can_split (pl, tmp, nrof))
     return;
-  if (QUERY_FLAG (tmp, FLAG_UNPAID))
+  if (tmp->flag [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));
       tmp->flag.set (FLAG_UNPAID);
     }
         goto leave;
     }
   else
     {                           /* non container pickup */
       for (alt = op->inv; alt; alt = alt->below)
-        if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) &&
+        if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
             alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
           break;                /* perfect match */
       if (!alt)
         for (alt = op->inv; alt; alt = alt->below)
-          if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
+          if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
             break;              /* General container comes next */
       if (!alt)
         alt = op;               /* No free containers */
     }
 #ifdef PICKUP_DEBUG
   LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
 #endif
   /* startequip items are not allowed to be put into containers: */
-  if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
+  if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
     {
       new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
       goto leave;
     }
   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.
  *
  * 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)
 {
-  object *tmp2, *sack2;
+  object *tmp2;
   char buf[MAX_BUF];
   if (sack == tmp)
     return;                     /* Can't put an object in itself */
-  if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
+  if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
       return;
     }
     {
       /* 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;
       new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
       for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
         {
           tmp = tmp2->below;
    * already checked this.
    */
   if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
     return;
-  if (QUERY_FLAG (tmp, FLAG_APPLIED))
+  if (tmp->flag [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;
     return;
   if (obj->destroyed () || obj->is_inserted ())
     return;
-  if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
+  if (obj->flag [FLAG_STARTEQUIP])
     {
       dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
       dropper->statusmsg ("The god who lent it to you retrieves it.");
       obj->destroy ();
       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 () && !obj->flag [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
  * 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))
+  if (tmp->flag [FLAG_NO_DROP])
     return;
-  if (QUERY_FLAG (tmp, FLAG_APPLIED))
+  if (tmp->flag [FLAG_APPLIED])
-    if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
+    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
    */
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
       return;
     }
-  if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
+  if (tmp->flag [FLAG_INV_LOCKED])
     {
       new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
       return;
     }
-  if (QUERY_FLAG (tmp, FLAG_NO_DROP))
+  if (tmp->flag [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.");
 #endif
     }
   object *curinv = op->inv;
   object *nextinv;
   /*
      This is the default.  Drops everything not locked or considered
      not something that should be dropped.
    */
   /*
      Care must be taken that the next item pointer is not to money as
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
-          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
+          if (!curinv->flag [FLAG_INV_LOCKED]
+              && !curinv->invisible
               && curinv->type != MONEY
               && curinv->type != FOOD
               && curinv->type != KEY
               && curinv->type != SPECIAL_KEY
               && curinv->type != GEM
-              && !curinv->invisible
+              && curinv->type != CONTAINER)
-              && (curinv->type != CONTAINER || op->container_ () != curinv))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           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)))
+          if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           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))
+          if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
-          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
+          if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
             {
               switch (curinv->type)
                 {
                   case HORN:
                   case BOOK:
  */
 int
 command_drop (object *op, char *params)
 {
   object *tmp, *next;
-  int did_one = 0;
   if (!params)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
       return 0;
       vector<object *> matched_objs;
       for (tmp = op->inv; tmp; tmp = next)
         {
           next = tmp->below;
-          if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
+          if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
             continue;
           if (item_matched_string (op, tmp, params))
             matched_objs.push_back (tmp);
         }
     }
   return 0;
 }
-/* op should be a player.
- * we return the object the player has marked with the 'mark' command
- * below.  If no match is found (or object has changed), we return
- * NULL.  We leave it up to the calling function to print messages if
- * nothing is found.
- */
-object *
-find_marked_object (object *op)
-{
-  object *tmp;
-  if (!op || !op->contr)
-    return NULL;
-  if (!op->contr->mark)
-    {
-/*	new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
-      return 0;
-    }
-  /* This may seem like overkill, but we need to make sure that they
-   * player hasn't dropped the item.  We use count on the off chance that
-   * an item got reincarnated at some point.
-   */
-  for (tmp = op->inv; tmp; tmp = tmp->below)
-    {
-      if (tmp->invisible)
-        continue;
-      if (tmp == op->contr->mark)
-        {
-          if (!tmp->destroyed ())
-            return tmp;
-          else
-            {
-              op->contr->mark = 0;
-/*		new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
-              return 0;
-            }
-        }
-    }
-  return 0;
-}
 std::string
 object::describe_monster (object *who)
 {
   dynbuf_text buf (512, 512);
   object *mon = head ? head : this;
-  if (QUERY_FLAG (mon, FLAG_UNDEAD))
+  if (mon->flag [FLAG_UNDEAD])
     buf << "It is an undead force.\r";
   if (mon->level > who->level)
     buf << "It is likely more powerful than you.\r";
   else if (mon->level < who->level)
       case SHIELD:
       case BOOTS:
       case GLOVES:
       case AMULET:
       case GIRDLE:
+      case RANGED:
       case BOW:
       case ARROW:
       case CLOAK:
       case FOOD:
       case DRINK:
  */
 void
 examine_monster (object *op, object *tmp)
 {
   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 (material != MATERIAL_NULL && !msg)
-    buf << (nrof > 1 ? "They are made of " : "It is made of ")
-        << material->description
-        << ".\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 (flag [FLAG_STARTEQUIP])
-    buf << (nrof > 1 ? "They were" : "It was")
-        << " given by a god and will vanish when dropped.\r";
-  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)
 {
    */
   if (params == NULL)
     {
       for (object *item = op->inv; item; item = item->below)
         {
-          CLEAR_FLAG(item, FLAG_INV_LOCKED);
+          item->clr_flag (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;
     }
    * 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);
+        item->clr_flag (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;
    */
   if (params == NULL)
     {
       for (object *item = op->inv; item; item = item->below)
         {
-          SET_FLAG (item, FLAG_INV_LOCKED);
+          item->set_flag (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;
     }
    * 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);
+        item->set_flag (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 = op->mark ())
+        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.107 by elmex, Fri Nov 13 15:41:39 2009 UTC vs. Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.107 by elmex, Fri Nov 13 15:41:39 2009 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC