[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs.
Revision 1.272 by root, Thu Apr 15 02:51:39 2010 UTC

   players.insert (this);
   ob->remove ();
   ob->map = 0;
   ob->activate_recursive ();
-  CLEAR_FLAG (ob, FLAG_FRIENDLY);
+  ob->clr_flag (FLAG_FRIENDLY);
   add_friendly_object (ob);
 }
 void
 player::deactivate ()
       next = op->below;
       /* Forces get applied per default, unless they have the
        * flag "neutral" set. Sorry but I can't think of a better way
        */
-      if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))
+      if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
-        SET_FLAG (op, FLAG_APPLIED);
+        op->set_flag (FLAG_APPLIED);
       /* we never give weapons/armour if these cannot be used
        * by this player due to race restrictions
        */
       if (pl->type == PLAYER)
         {
-          if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
+          if ((!pl->flag [FLAG_USE_ARMOUR]
                &&
                (op->type == ARMOUR     || op->type == BOOTS
                 || op->type == CLOAK   || op->type == HELMET
                 || op->type == SHIELD  || op->type == GLOVES
                 || op->type == BRACERS || op->type == GIRDLE))
-              || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
+              || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
             {
               op->destroy ();
               continue;
             }
         }
           if (op->nrof > 1)
             op->nrof = 1;
         }
       if (op->type == SPELLBOOK && op->inv)
-        CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
+        op->inv->clr_flag (FLAG_STARTEQUIP);
       /* Give starting characters identified, uncursed, and undamned
        * items. Just don't identify gold or silver, or it won't be
        * merged properly.
        */
-      if (need_identify (op))
+      if (op->need_identify ())
         {
-          SET_FLAG (op, FLAG_IDENTIFIED);
+          op->set_flag (FLAG_IDENTIFIED);
-          CLEAR_FLAG (op, FLAG_CURSED);
+          op->clr_flag (FLAG_CURSED);
-          CLEAR_FLAG (op, FLAG_DAMNED);
+          op->clr_flag (FLAG_DAMNED);
         }
       if (op->type == SPELL)
         {
           op->destroy ();
           continue;
         }
       else if (op->type == SKILL)
         {
-          SET_FLAG (op, FLAG_CAN_USE_SKILL);
+          op->set_flag (FLAG_CAN_USE_SKILL);
           op->stats.exp = 0;
           op->level = 1;
         }
       else /* lock all 'normal items by default */
-        SET_FLAG (op, FLAG_INV_LOCKED);
+        op->set_flag (FLAG_INV_LOCKED);
     }                           /* for loop of objects in player inv */
   /* Need to set up the skill pointers */
   pl->contr->link_skills ();
 }
   if (ob->msg)
     ob->msg = 0;
   start_info (ob);
-  CLEAR_FLAG (ob, FLAG_WIZ);
+  ob->clr_flag (FLAG_WIZ);
   give_initial_items (ob, ob->randomitems);
   esrv_send_inventory (ob, ob);
   ob->update_stats ();
   /* This moves the player to a different start map, if there
   rv_vector rv;
   if (op->stats.hp < 0)
     {
       LOG (llevDebug, "Fleeing player is dead.\n");
-      CLEAR_FLAG (op, FLAG_SCARED);
+      op->clr_flag (FLAG_SCARED);
       return;
     }
   if (!op->enemy)
     {
       LOG (llevDebug, "Fleeing player had no enemy.\n");
-      CLEAR_FLAG (op, FLAG_SCARED);
+      op->clr_flag (FLAG_SCARED);
       return;
     }
   if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
     {
       op->enemy = NULL;
-      CLEAR_FLAG (op, FLAG_SCARED);
+      op->clr_flag (FLAG_SCARED);
       return;
     }
   get_rangevector (op, op->enemy, &rv, 0);
       if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
         return;
     }
   /* Cornered, get rid of scared */
-  CLEAR_FLAG (op, FLAG_SCARED);
+  op->clr_flag (FLAG_SCARED);
   op->enemy = NULL;
 }
 /* check_pick sees if there is stuff to be picked up/picks up stuff.
  * It returns 1 if the player should keep on moving, 0 if he should
        * fighting */
       if (op->contr->mode & PU_INHIBIT)
         return 1;
       /* prevent us from turning into auto-thieves :) */
-      if (QUERY_FLAG (tmp, FLAG_UNPAID))
+      if (tmp->flag [FLAG_UNPAID])
         continue;
       /* ignore known cursed objects */
-      if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
+      if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
         continue;
       /* all food and drink if desired */
       /* question: don't pick up known-poisonous stuff? */
       if (op->contr->mode & PU_FOOD)
             CHK_PICK_PICKUP;
             continue;
           }
       if (op->contr->mode & PU_DRINK)
-        if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
+        if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
           {
             CHK_PICK_PICKUP;
             continue;
           }
             continue;
           }
       /* pick up all magical items */
       if (op->contr->mode & PU_MAGICAL)
-        if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
+        if (tmp->flag [FLAG_KNOWN_MAGICAL]
-            && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
+            && !tmp->flag [FLAG_KNOWN_CURSED])
           {
             CHK_PICK_PICKUP;
             continue;
           }
             continue;
           }
       /* hoping to catch throwing daggers here */
       if (op->contr->mode & PU_MISSILEWEAPON)
-        if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
+        if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
           {
             CHK_PICK_PICKUP;
             continue;
           }
  * return 0.
  */
 static int
 action_makes_visible (object *op)
 {
-  if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
+  if (op->invisible && op->flag [FLAG_ALIVE])
     {
-      if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
+      if (op->flag [FLAG_MAKE_INVIS])
         {
           // artefact invisibility is permanent, but we still make noise
           // this is important for game-balance.
           if (op->contr)
             op->make_noise ();
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == ARROW && !strcmp (&tmp->race, type))
       return splay (tmp);
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
-    if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
+    if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
       if (object *arrow = find_arrow (tmp, type))
         {
           splay (tmp);
           return arrow;
         }
   if (!type)
     return NULL;
   for (arrow = op->inv; arrow; arrow = arrow->below)
     {
-      if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
+      if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
         {
           i = 0;
           ntmp = find_better_arrow (arrow, target, type, &i);
           if (i > betterby)
           break;
         }
       if (mflags & P_IS_ALIVE)
         for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
-          if (QUERY_FLAG (tmp, FLAG_ALIVE))
+          if (tmp->flag [FLAG_ALIVE])
             break;
     }
   if (!tmp)
     return find_arrow (op, type);
         {
           if (op->type == PLAYER)
             new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
           /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
           else
-            CLEAR_FLAG (op, FLAG_READY_BOW);
+            op->clr_flag (FLAG_READY_BOW);
           return 0;
         }
     }
             {
               object *tmp;
               if (item->arch)
                 {
-                  CLEAR_FLAG (item, FLAG_ANIMATE);
+                  item->clr_flag (FLAG_ANIMATE);
                   item->face = item->arch->face;
                   item->set_speed (0);
                 }
               if (object *pl = item->visible_to ())
        *
        * Change the color so that the message doesn't disappear with
        * all the others.
        */
       if (pl->contr->usekeys == key_inventory
-          || !QUERY_FLAG (container, FLAG_APPLIED)
+          || !container->flag [FLAG_APPLIED]
           || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
         {
           new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
                                 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
           return NULL;
    */
   if (op->type == PLAYER
       && ((mon->owner && mon->owner->contr
            && same_party (mon->owner->contr->party, op->contr->party))
           || mon->owner == op)
-      && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
+      && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
     {
       /* If we're braced, we don't want to switch places with it */
       if (op->contr->braced)
         return false;
    * creatures.  Note that if you are braced, you can't push
    * someone, but put it inside this loop so that you won't
    * attack them either.
    */
   if ((mon->type == PLAYER || mon->enemy != op)
-      && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
+      && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
       && ((op->contr->peaceful
            || (mon->type == PLAYER && mon->contr->peaceful))
           && !on_battleground))
     {
       if (op->speed_left > 0.f)
         }
     }
   /* If the object is a boulder or other rollable object, then
    * roll it if not braced.  You can't roll it if you are braced.
    */
-  else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
+  else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
     {
       if (op->speed_left > 0.f)
         {
           --op->speed_left;
    * Way it works is like this:  First, it must have some hit points
    * and be living.  Then, it must be one of the following:
    * 1) Not a player, 2) A player, but of a different party.  Note
    * that party_number -1 is no party, so attacks can still happen.
    */
-  else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
+  else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
            ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
     {
       if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
         {
           --op->contr->weapon_sp_left;
 {
   if (!op->map || op->map->in_memory != MAP_ACTIVE)
     return 0;
   /* Sanity check: make sure dir is valid */
-  if (dir < 0 || dir >= 9)
+  if (dir < 0 || dir > 8)
     {
       LOG (llevError, "move_player: invalid direction %d\n", dir);
       return 0;
     }
   /* peterm: added following line */
-  if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
+  if (op->flag [FLAG_CONFUSED] && dir)
     dir = absdir (dir + rndm (3) + rndm (3) - 2);
   op->facing = dir;
   if (op->flag [FLAG_HIDDEN])
  * players.
  */
 bool
 handle_newcs_player (object *op)
 {
-  if (QUERY_FLAG (op, FLAG_SCARED))
+  if (op->flag [FLAG_SCARED])
     {
       if (op->speed_left > 0.f)
         {
           --op->speed_left;
           flee_player (op);
 }
 static int
 save_life (object *op)
 {
-  if (!QUERY_FLAG (op, FLAG_LIFESAVE))
+  if (!op->flag [FLAG_LIFESAVE])
     return 0;
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
-    if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
+    if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
       {
         op->play_sound (sound_find ("ob_evaporate"));
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
         tmp->destroy ();
-        CLEAR_FLAG (op, FLAG_LIFESAVE);
+        op->clr_flag (FLAG_LIFESAVE);
         if (op->stats.hp < 0)
           op->stats.hp = op->stats.maxhp;
         if (op->stats.food < 0)
         op->update_stats ();
         return 1;
       }
   LOG (llevError, "Error: LIFESAVE set without applied object.\n");
-  CLEAR_FLAG (op, FLAG_LIFESAVE);
+  op->clr_flag (FLAG_LIFESAVE);
   enter_player_savebed (op);    /* bring him home. */
   return 0;
 }
 /* This goes throws the inventory and removes unpaid objects, and puts them
 {
   while (op)
     {
       object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
-      if (QUERY_FLAG (op, FLAG_UNPAID))
+      if (op->flag [FLAG_UNPAID])
         op->insert_at (env);
       else if (op->inv)
         drop_unpaid_items (op->inv, env);
       op = next;
        * alternate it here for it to work correctly.
        */
       if (pticks & 2)
         op->invisible--;
     }
-  else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
+  else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
     {
       if (!op->invisible--)
         {
           make_visible (op);
           new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
               if (op->stats.sp < op->stats.maxsp)
                 {
                   op->stats.sp++;
                   /* dms do not consume food */
-                  if (!QUERY_FLAG (op, FLAG_WIZ))
+                  if (!op->flag [FLAG_WIZ])
                     {
                       op->stats.food--;
                       if (op->contr->digestion < 0)
                         op->stats.food += op->contr->digestion;
               if (op->stats.hp < op->stats.maxhp)
                 {
                   op->stats.hp++;
                   /* dms do not consume food */
-                  if (!QUERY_FLAG (op, FLAG_WIZ))
+                  if (!op->flag [FLAG_WIZ])
                     {
                       op->stats.food--;
                       if (op->contr->digestion < 0)
                         op->stats.food += op->contr->digestion;
               penalty = max (0, -op->contr->digestion);
           op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
           /* dms do not consume food */
-          if (!QUERY_FLAG (op, FLAG_WIZ))
+          if (!op->flag [FLAG_WIZ])
             op->stats.food--;
         }
       if (op->stats.food < 0 && op->stats.hp >= 0)
         {
           object *flesh = 0;
           for_inv_removable (op, tmp)
             {
-              if (QUERY_FLAG (tmp, FLAG_UNPAID))
+              if (tmp->flag [FLAG_UNPAID])
                 continue;
               if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
                 {
                   op->statusmsg ("You blindly grab for a bite of food. "
               op->contr->killer->destroy ();
             }
         }
       /* killer should be set here already */
-      if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
+      if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
         kill_player (op);
     }
 }
 /* If the player should die (lack of hp, food, etc), we call this.
                * difference.
                */
               if (this_stat >= -50)
                 {
                   change_attr_value (&(dep->stats), i, -1);
-                  SET_FLAG (dep, FLAG_APPLIED);
+                  dep->set_flag (FLAG_APPLIED);
                   new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
                   op->update_stats ();
                   lost_a_stat = 1;
                 }
             }
       force = get_archetype (FORCE_NAME);
       /* 50 ticks should be enough time for the spell to abate */
       force->speed = 0.1f;
       force->speed_left = -5.f;
-      SET_FLAG (force, FLAG_APPLIED);
+      force->set_flag (FLAG_APPLIED);
       for (at = 0; at < NROFATTACKS; at++)
         if (will_kill_again & (1 << at))
           force->resist[at] = 100;
       insert_ob_in_ob (force, op);
       tmp->x = op->x, tmp->y = op->y;
       if (tmp->type == CONTAINER)
         loot_object (tmp); /* empty container to ground */
-      if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
+      if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
         {
           if (tmp->nrof > 1)
             {
               tmp->decrease (rndm (1, tmp->nrof - 1));
               insert_ob_in_map (tmp, op->map, NULL, 0);
 }
 int
 is_true_undead (object *op)
 {
-  if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
+  if (op->arch->flag [FLAG_UNDEAD])
     return 1;
   return 0;
 }
   if (who->type == PLAYER)
     player = 1;
   else
-    friendly = QUERY_FLAG (who, FLAG_FRIENDLY);
+    friendly = who->flag [FLAG_FRIENDLY];
   /* search adjacent squares */
   for (i = 1; i < 9; i++)
     {
       x = who->x + freearr_x[i];
       if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
         continue;
       for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
         {
-          if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
+          if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
             return 1;
           else if (tmp->type == PLAYER)
             {
               /*don't let a hidden DM prevent you from hiding */
-              if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
+              if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
                 return 1;
             }
         }
     }
   return 0;
    * and the exit-coordinates sp/hp must both be > 0.
    * => The intention here is to prevent abuse of the battleground-
    * feature (like pickable or hidden battleground tiles). */
   for (object *tmp = op->below; tmp; tmp = tmp->below)
     {
-      if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
+      if (tmp->flag [FLAG_IS_FLOOR])
         {
-          if (QUERY_FLAG (tmp, FLAG_NO_PICK)
+          if (tmp->flag [FLAG_NO_PICK]
               && tmp->type == BATTLEGROUND
               && tmp->name == shstr_battleground
               && EXIT_X (tmp) && EXIT_Y (tmp))
             {
               /* before we assign the exit, check if this is a teambattle */
           strcat (buf, ".");
           new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
         }
       /* evtl. adding flags: */
-      if (QUERY_FLAG (item, FLAG_XRAYS))
+      if (item->flag [FLAG_XRAYS])
-        SET_FLAG (skin, FLAG_XRAYS);
+        skin->set_flag (FLAG_XRAYS);
-      if (QUERY_FLAG (item, FLAG_STEALTH))
+      if (item->flag [FLAG_STEALTH])
-        SET_FLAG (skin, FLAG_STEALTH);
+        skin->set_flag (FLAG_STEALTH);
-      if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))
+      if (item->flag [FLAG_SEE_IN_DARK])
-        SET_FLAG (skin, FLAG_SEE_IN_DARK);
+        skin->set_flag (FLAG_SEE_IN_DARK);
       /* print message if there is one */
       if (item->msg != NULL)
         new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
     }
 {
   play_sound (sound_find ("generic_failure"));
   statusmsg (msg, color);
 }
+void
+object::failmsgf (const char *format, ...)
+{
+  if (!contr)
+    return;
+  va_list ap;
+  va_start (ap, format);
+  contr->failmsg (vformat (format, ap));
+  va_end (ap);
+}
+void
+player::failmsgf (const char *format, ...)
+{
+  va_list ap;
+  va_start (ap, format);
+  failmsg (vformat (format, ap));
+  va_end (ap);
+}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs. Revision 1.272 by root, Thu Apr 15 02:51:39 2010 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs.
Revision 1.272 by root, Thu Apr 15 02:51:39 2010 UTC