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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.58 by root, Fri Apr 2 03:41:25 2010 UTC vs.
Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC

       next_tmp = tmp->below;
       /* we mark special prayers with the STARTEQUIP flag, so if it isn't
        * in that category, not something we need to worry about.
        */
-      if (tmp->type != SPELL || !QUERY_FLAG (tmp, FLAG_STARTEQUIP))
+      if (tmp->type != SPELL || !tmp->flag [FLAG_STARTEQUIP])
         continue;
       if (god->randomitems == NULL)
         {
           LOG (llevError, "BUG: check_special_prayers(): god %s without randomitems\n", &god->name);
  * Unapplies up to number worth of items of type
  */
 static void
 stop_using_item (object *op, int type, int number)
 {
-  object *tmp;
-  for (tmp = op->inv; tmp && number; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp && number; tmp = tmp->below)
-    if (tmp->type == type && QUERY_FLAG (tmp, FLAG_APPLIED))
+    if (tmp->type == type && tmp->flag [FLAG_APPLIED])
       {
-        apply_special (op, tmp, AP_UNAPPLY | AP_IGNORE_CURSE);
+        op->apply (tmp, AP_UNAPPLY | AP_IGNORE_CURSE);
-        number--;
+        --number;
       }
 }
 /**
  * If the god does/doesnt have this flag, we
  * already exist. For players only!
  */
 static void
 update_priest_flag (object *god, object *exp_ob, uint32 flag)
 {
-  if (QUERY_FLAG (god, flag) && !QUERY_FLAG (exp_ob, flag))
+  if (god->flag [flag] && !exp_ob->flag [flag])
-    SET_FLAG (exp_ob, flag);
+    exp_ob->flag [flag];
-  else if (QUERY_FLAG (exp_ob, flag) && !QUERY_FLAG (god, flag))
+  else if (exp_ob->flag [flag] && !god->flag [flag])
     {
       /*  When this is called with the exp_ob set to the player,
        * this check is broken, because most all players arch
        * allow use of weapons.  I'm not actually sure why this
        * check is here - I guess if you had a case where the
        * the god places on it, this may make sense.  But I don't think
        * there is any case like that.
        */
 /*        if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
-      CLEAR_FLAG (exp_ob, flag);
+      exp_ob->clr_flag (flag);
     };
 }
 /**
  * Forbids or let player use something item type.
  * string is the string to print out.
  */
 static int
 worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string)
 {
-  if (QUERY_FLAG (op->arch, flag))
+  if (op->arch->flag [flag])
-    if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
+    if (op->flag [flag] != exp_obj->flag [flag])
       {
         update_priest_flag (exp_obj, op, flag);
-        if (QUERY_FLAG (op, flag))
+        if (op->flag [flag])
           new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string);
         else
           {
             new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string);
             return 1;
   for (item = op->inv; item; item = next)
     {
       next = item->below;
       // remove all invisible startequip items which are not skill, exp or force
-      if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
+      if (item->flag [FLAG_STARTEQUIP] && item->invisible &&
           (item->type != SKILL) && (item->type != FORCE))
         {
           if (item->type == SPELL)
             {
               new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name);
     }
   /* remove any godgiven items from the old god */
   if (old_god)
     for (tr = old_god->randomitems->items; tr; tr = tr->next)
-      if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
+      if (tr->item && tr->item->flag [FLAG_STARTEQUIP])
         follower_remove_similar_item (op, tr->item);
   if (!op || !new_god)
     return;
     /* The archetype should always be defined - if we crash here because it doesn't,
      * things are really messed up anyways.
      */
     skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
-  sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
+  sk_applied = skop->flag [FLAG_APPLIED]; /* save skill status */
   /* Clear the "undead" status. We also need to force a call to change_abil,
    * so I set undeadified for that.
    * - gros, 21th July 2006.
    */
-  if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
+  if (old_god && old_god->flag [FLAG_UNDEAD])
     {
-      CLEAR_FLAG (skop, FLAG_UNDEAD);
+      skop->clr_flag (FLAG_UNDEAD);
       undeadified = 1;
     }
   if (skop->title)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
       /* The point of this is to really show what abilities the player just lost */
       if (sk_applied || undeadified)
         {
-          CLEAR_FLAG (skop, FLAG_APPLIED);
+          skop->clr_flag (FLAG_APPLIED);
           change_abil (op, skop);
         }
     }
   /* now change to the new gods attributes to exp_obj */
       stop_using_item (op, BOOTS, 1);
       stop_using_item (op, GLOVES, 1);
       stop_using_item (op, SHIELD, 1);
     }
-  SET_FLAG (skop, FLAG_APPLIED);
+  skop->set_flag (FLAG_APPLIED);
   change_abil (op, skop);
   /* return to previous skill status */
   if (!sk_applied)
-    CLEAR_FLAG (skop, FLAG_APPLIED);
+    skop->clr_flag (FLAG_APPLIED);
   check_special_prayers (op, new_god);
 }
 archetype *
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     {
       if (tmp->invisible)
         continue;
-      if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
+      if (tmp->flag [FLAG_DAMNED] && !remove_damnation)
         continue;
-      if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
+      if (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
         {
           success = 1;
-          CLEAR_FLAG (tmp, FLAG_DAMNED);
+          tmp->clr_flag (FLAG_DAMNED);
-          CLEAR_FLAG (tmp, FLAG_CURSED);
+          tmp->clr_flag (FLAG_CURSED);
-          CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
+          tmp->clr_flag (FLAG_KNOWN_CURSED);
           if (object *pl = tmp->visible_to ())
             esrv_update_item (UPD_FLAGS, pl, tmp);
         }
     }
   object *weapon;
   uint32 attacktype;
   int tmp;
   for (weapon = op->inv; weapon; weapon = weapon->below)
-    if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
+    if ((weapon->type == WEAPON || weapon->type == BOW) && weapon->flag [FLAG_APPLIED])
       break;
   if (!weapon || god_examines_item (god, weapon) <= 0)
     return 0;
 {
   int reaction = 1;
   object *item = NULL, *skop;
   for (item = op->inv; item; item = item->below)
-    if (QUERY_FLAG (item, FLAG_APPLIED))
+    if (item->flag [FLAG_APPLIED])
       reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1);
   /* well, well. Looks like we screwed up. Time for god's revenge */
   if (reaction < 0)
     {

Diff Legend

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

Comparing deliantra/server/server/gods.C (file contents): Revision 1.58 by root, Fri Apr 2 03:41:25 2010 UTC vs. Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.58 by root, Fri Apr 2 03:41:25 2010 UTC vs.
Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC