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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC vs.
Revision 1.126 by root, Tue Jan 3 11:25:36 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * 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
       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;
         }
  * 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 throwing skill.");
   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;
     }
   /* 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;
     }
   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;
     }
    * 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 (!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;
   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 (dropper->is_in_shop () && !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;
  * 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 (!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
           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:
       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:
    */
   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;
 int
 command_mark (object *op, char *params)
 {
   if (!params)
     {
-      if (object *mark = find_marked_object (op))
+      if (object *mark = op->mark ())
         op->statusmsg (format ("%s is marked.", query_name (mark)));
       else
         op->failmsg ("You have no marked object.");
     }
   else

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC vs. Revision 1.126 by root, Tue Jan 3 11:25:36 2012 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC vs.
Revision 1.126 by root, Tue Jan 3 11:25:36 2012 UTC