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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.124 by root, Thu Aug 16 11:01:10 2007 UTC vs.
Revision 1.125 by root, Thu Aug 16 11:34:29 2007 UTC

   floor = GET_MAP_OB (op->map, op->x, op->y);
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
-      op->errormsg ("Gods prevent you from using this here, it's sacred ground!");
+      op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
       CLEAR_FLAG (tmp, FLAG_APPLIED);
       return 0;
     }
       else
         {                       /* cursed potion */
           if (got_one)
             {
               op->update_stats ();
-              op->errormsg ("The Gods are angry and punish you.");
+              op->failmsg ("The Gods are angry and punish you.");
             }
           else
             op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
         }
     {
       if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
         {
           object *fball;
-          op->errormsg ("Yech! Your lungs are on fire!");
+          op->failmsg ("Yech! Your lungs are on fire!");
           /* Explodes a fireball centered at player */
           fball = get_archetype (EXPLODING_FIREBALL);
           fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
           fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
   if (improver->slaying)
     {
       count = check_item (op, improver->slaying);
       if (count < 1)
         {
-          op->errormsg (format ("The gods want more %ss", &improver->slaying));
+          op->failmsg (format ("The gods want more %ss", &improver->slaying));
           return 0;
         }
     }
   else
     count = 1;
   /* So it updates the players stats and the window */
   op->update_stats ();
   op->statusmsg (format (
-     "Your sacrifice was accepted.\n"
+    "Your sacrifice was accepted.\n"
-     "Weapon's bonus to %s improved by %d.",
+    "Weapon's bonus to %s improved by %d.",
-     statname, sacrifice_count
+    statname, sacrifice_count
   ));
   return 1;
 }
   int sacrifice_count, i;
   char buf[MAX_BUF];
   if (weapon->level != 0)
     {
-      op->errormsg ("Weapon is already prepared!");
+      op->failmsg ("Weapon is already prepared!");
       return 0;
     }
   for (i = 0; i < NROFATTACKS; i++)
     if (weapon->resist[i])
   if (i < NROFATTACKS || weapon->stats.hp ||    /* regeneration */
       (weapon->stats.sp && weapon->type == WEAPON) ||   /* sp regeneration */
       weapon->stats.exp ||      /* speed */
       weapon->stats.ac)         /* AC - only taifu's I think */
     {
-      op->errormsg ("You cannot prepare magic weapons.");
+      op->failmsg ("You cannot prepare magic weapons.");
       return 0;
     }
   sacrifice_count = check_sacrifice (op, improver);
   if (sacrifice_count <= 0)
   weapon->level = isqrt (sacrifice_count);
   eat_item (op, improver->slaying, sacrifice_count);
   op->statusmsg (format (
-     "Your sacrifice was accepted."
+    "Your sacrifice was accepted."
-     "Your *%s may be improved %d times.",
+    "Your *%s may be improved %d times.",
-     &weapon->name, weapon->level
+    &weapon->name, weapon->level
   ));
   sprintf (buf, "%s's %s", &op->name, &weapon->name);
   weapon->name = weapon->name_pl = buf;
   weapon->nrof = 0;             /*  prevents preparing n weapons in the same
   if (improver->stats.sp == IMPROVE_PREPARE)
     return prepare_weapon (op, improver, weapon);
   if (weapon->level == 0)
     {
-      op->errormsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
+      op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
       return 0;
     }
   if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
     {
-      op->errormsg ("This weapon cannot be improved any more.");
+      op->failmsg ("This weapon cannot be improved any more.");
       return 0;
     }
   if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
     {
-      op->errormsg ("Improving the weapon will make it too "
+      op->failmsg ("Improving the weapon will make it too "
                     "powerful for you to use. Unready it if you "
                     "really want to improve it.");
       return 0;
     }
   sacrifice_needed *= 2;
   sacrifice_count = check_sacrifice (op, improver);
   if (sacrifice_count < sacrifice_needed)
     {
-      op->errormsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
+      op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
       return 0;
     }
   eat_item (op, improver->slaying, sacrifice_needed);
   weapon->item_power++;
       case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
       case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
       case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
       case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
       default:
-        op->errormsg ("Unknown improvement type.");
+        op->failmsg ("Unknown improvement type.");
     }
   LOG (llevError, "improve_weapon: Got to end of function\n");
   return 0;
 }
   if (op->type != PLAYER)
     return 0;
   if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
     {
-      op->errormsg ("Something blocks the magic of the scroll!");
+      op->failmsg ("Something blocks the magic of the scroll!");
       return 0;
     }
   otmp = find_marked_object (op);
   if (!otmp)
     {
-      op->errormsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
+      op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
       return 0;
     }
   if (otmp->type != WEAPON && otmp->type != BOW)
     {
-      op->errormsg ("Marked item is not a weapon or bow!");
+      op->failmsg ("Marked item is not a weapon or bow!");
       return 0;
     }
   op->statusmsg ("Applied weapon builder.");
 {
   object *tmp;
   if (armour->magic >= settings.armor_max_enchant)
     {
-      op->errormsg ("This armour can not be enchanted any further!");
+      op->failmsg ("This armour can not be enchanted any further!");
       return 0;
     }
   /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
    * etc), so take the easy way out and don't worry about it.
    * Note - maybe add scrolls which make the random artifact versions (eg, armour
    * of gnarg and what not?)
    */
   if (armour->title)
     {
-      op->errormsg ("This armour will not accept further enchantment.");
+      op->failmsg ("This armour will not accept further enchantment.");
       return 0;
     }
   /* Split objects if needed.  Can't insert tmp until the
    * end of this function - otherwise it will just re-merge.
   op->contr->last_used = 0;
   if (sack->env && sack->env != op)
     {
-      op->errormsg ("You must put it onto the floor or into your inventory first.");
+      op->failmsg ("You must put it onto the floor or into your inventory first.");
       return 1;
     }
   // already applied == open on ground, or open in inv, or active in inv
   if (sack->flag [FLAG_APPLIED])
           return 1;
         }
       else if (!sack->env)
         {
           // active, but not ours: some other player has opened it
-          op->errormsg (format ("Somebody else is using the %s already.", query_name (sack)));
+          op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
           return 1;
         }
       // fall through to opening it (active in inv)
     }
    * move_on is zero, it needs to be manually applied (doesn't talk
    * to us).
    */
   if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
     {
-      op->errormsg ("You are unable to read while blind!");
+      op->failmsg ("You are unable to read while blind!");
       return;
     }
   if (op->contr)
     if (client *ns = op->contr->ns)
         }
       case CONVERTER:
         if (convert_item (victim, trap) < 0)
           {
-            originator->errormsg (format ("The %s seems to be broken!", query_name (trap)));
+            originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
             get_archetype ("burnout")->insert_at (trap, trap);
           }
         goto leave;
   int lev_diff;
   object *skill_ob;
   if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
     {
-      op->errormsg ("You are unable to read while blind!");
+      op->failmsg ("You are unable to read while blind!");
       return;
     }
   if (!tmp->msg)
     {
-      op->errormsg (format ("You open the %s and find it empty.", &tmp->name));
+      op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
       return;
     }
   /* need a literacy skill to read stuff! */
   skill_ob = find_skill_by_name (op, tmp->skill);
   if (!skill_ob)
     {
-      op->errormsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
+      op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
       return;
     }
   lev_diff = tmp->level - (skill_ob->level + 5);
   if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
     {
-      op->errormsg (lev_diff <  2 ? "This book is just barely beyond your comprehension."
+      op->failmsg (lev_diff <  2 ? "This book is just barely beyond your comprehension."
                   : lev_diff <  3 ? "This book is slightly beyond your comprehension."
                   : lev_diff <  5 ? "This book is beyond your comprehension."
                   : lev_diff <  8 ? "This book is quite a bit beyond your comprehension."
                   : lev_diff < 15 ? "This book is way beyond your comprehension."
                   :                 "This book is totally beyond your comprehension.");
 {
   switch (learn_skill (op, tmp))
     {
       case 0:
         op->play_sound (sound_find ("generic_fail"));
-        op->errormsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
+        op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
         break;
       case 1:
         decrease_ob (tmp);
         op->play_sound (sound_find ("skill_learn"));
         break;
       default:
         decrease_ob (tmp);
         op->play_sound (sound_find ("generic_fail"));
-        op->errormsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
+        op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
         break;
     }
 }
 /**
     {
       LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
       return;
     }
-  new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell);
+  op->failmsg (format ("You lose knowledge of %s.", spell));
   player_unready_range_ob (op->contr, spob);
   esrv_remove_spell (op->contr, spob);
   spob->destroy ();
 }
 {
   object *skop, *spell, *spell_skill;
   if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
     {
-      op->errormsg ("You are unable to read while blind.");
+      op->failmsg ("You are unable to read while blind.");
       return;
     }
   /* artifact_spellbooks have 'slaying' field point to a spell name,
    * instead of having their spell stored in stats.sp.  These are
   if (tmp->slaying)
     {
       spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
       if (!spell)
         {
-          op->errormsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
+          op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
           return;
         }
       else
         insert_ob_in_ob (spell, tmp);
   /* need a literacy skill to learn spells. Also, having a literacy level
    * lower than the spell will make learning the spell more difficult */
   if (!skop)
     {
-      op->errormsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
+      op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
       return;
     }
   spell = tmp->inv;
   if (!spell)
     {
       LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
-      op->errormsg ("The spellbook symbols make no sense. This is a bug, please report!");
+      op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
       return;
     }
   if (skop->level < int (sqrtf (spell->level) * 1.5f))
     {
-      op->errormsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
+      op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
       return;
     }
   op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
     {
       spell_skill = find_skill_by_name (op, spell->skill);
       if (!spell_skill)
         {
-          op->errormsg (format ("You lack the skill %s to use this spell.", &spell->skill));
+          op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
           return;
         }
       if (spell_skill->level < spell->level)
         {
-          op->errormsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
+          op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
           return;
         }
     }
   /* Logic as follows
    * Overall, chances are the same but a player will find having a high
    * literacy rate very useful!  -b.t.
    */
   if (QUERY_FLAG (op, FLAG_CONFUSED))
     {
-      op->errormsg ("In your confused state you flub the wording of the text!");
+      op->failmsg ("In your confused state you flub the wording of the text!");
       scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
     }
   else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
            (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
     {
         change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
     }
   else
     {
       op->contr->play_sound (sound_find ("fumble_spell"));
-      op->errormsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
+      op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
     }
   decrease_ob (tmp);
 }
 {
   object *skop;
   if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
     {
-      op->errormsg ("You are unable to read while blind.");
+      op->failmsg ("You are unable to read while blind.");
       return;
     }
   if (!tmp->inv || tmp->inv->type != SPELL)
     {
-      op->errormsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
+      op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
       return;
     }
   if (op->type == PLAYER)
     {
        */
       skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
       if (!skop)
         {
-          op->errormsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
+          op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
           return;
         }
       if ((exp_gain = calc_skill_exp (op, tmp, skop)))
         change_exp (op, exp_gain, skop->skill, 0);
         {
           /* usual case - no dragon meal: */
           if (op->stats.food + tmp->stats.food > 999)
             {
               if (tmp->type == FOOD || tmp->type == FLESH)
-                op->errormsg ("You feel full, but what a waste of food!");
+                op->failmsg ("You feel full, but what a waste of food!");
               else
                 op->statusmsg ("Most of the drink goes down your face not your throat!");
             }
           if (!QUERY_FLAG (tmp, FLAG_CURSED))
     {
       abil->last_eat = meal->last_eat;  /* write: last_eat <new attnr focus> */
       if (meal->last_eat != abil->stats.exp)
         op->statusmsg (format (
-           "Your metabolism prepares to focus on %s!\n"
+          "Your metabolism prepares to focus on %s!\n"
-           "The change will happen at level %d.",
+          "The change will happen at level %d.",
-           change_resist_msg[meal->last_eat],
+          change_resist_msg[meal->last_eat],
-           abil->level + 1
+          abil->level + 1
         ));
       else
         {
           op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
           abil->last_eat = 0;
 {
   object *armor;
   if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
     {
-      op->errormsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
+      op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
       return;
     }
   armor = find_marked_object (op);
   if (!armor)
     {
-      op->errormsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
+      op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
       return;
     }
   if (armor->type != ARMOUR
       && armor->type != CLOAK
       && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
     {
-      op->errormsg ("Your marked item is not armour!\n");
+      op->failmsg ("Your marked item is not armour!\n");
       return;
     }
   op->statusmsg ("Applying armour enchantment.");
   improve_armour (op, tmp, armor);
 apply_poison (object *op, object *tmp)
 {
   if (op->type == PLAYER)
     {
       op->contr->play_sound (sound_find ("drink_poison"));
-      op->errormsg ("Yech! That tasted poisonous!");
+      op->failmsg ("Yech! That tasted poisonous!");
       strcpy (op->contr->killer, "poisonous booze");
     }
   if (tmp->stats.hp > 0)
     {
   if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
     {
       if (op->type == PLAYER)
         {
-          op->errormsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
+          op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
           return 1;
         }
       else
         return 0;             /* monsters just skip unpaid items */
     }
           {
             op->statusmsg ("You turn the handle.");
             op->play_sound (sound_find ("turn_handle"));
           }
         else
-          op->errormsg ("The handle doesn't move.");
+          op->failmsg ("The handle doesn't move.");
         return 1;
       case EXIT:
         if (op->type != PLAYER)
           return 0;
         if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
-          op->errormsg (format ("The %s is closed.", query_name (tmp)));
+          op->failmsg (format ("The %s is closed.", query_name (tmp)));
         else
           {
             /* Don't display messages for random maps. */
             if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
               op->statusmsg (tmp->msg, NDI_NAVY);
             timeofday_t tod;
             get_tod (&tod);
             op->play_sound (sound_find ("sound_clock"));
             op->statusmsg (format (
-               "It is %d minute%s past %d o'clock %s",
+              "It is %d minute%s past %d o'clock %s",
-               tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
+              tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
-               ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
+              ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
             ));
             return 1;
           }
         else
           return 0;
   if (op->env && (pl->move_type & MOVE_FLYING))
     {
       /* player is flying and applying object not in inventory */
       if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
         {
-          op->errormsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
+          op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
           return 0;
         }
     }
   pl->contr->last_used = op;
   if (!quiet)
     {
       if (tmp == 0)
         op->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
       else if (tmp == 2)
-        op->errormsg ("You must get it first!\n");
+        op->failmsg ("You must get it first!\n");
     }
   return tmp;
 }
           if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
             {
               if (who->contr)
                 {
-                  who->errormsg ("Oops, it feels deadly cold!");
+                  who->failmsg ("Oops, it feels deadly cold!");
                   SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
                 }
             }
           if (who->contr)
     for (object *tmp = who->inv; tmp; tmp = tmp->below)
       if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
         if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
           {
             if (aflags & AP_PRINT)
-              new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
+              who->failmsg (query_name (tmp));
             else
               unapply_special (who, tmp, aflags);
           }
         else
           {
             /* In this case, we want to try and remove a cursed item.
              * While we know it won't work, we want unapply_special to
              * at least generate the message.
              */
-            new_draw_info_format (NDI_UNIQUE, 0, who,
+            who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
-                                  "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
-                                  query_name (tmp));
             return 1;
           }
   for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
     {
               /* If we are just printing, we don't care about cursed status */
               if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
                 {
                   if (aflags & AP_PRINT)
-                    new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
+                    who->failmsg (query_name (tmp));
                   else
                     unapply_special (who, tmp, aflags);
                 }
               else
                 {
                   /* Cursed item that we can't unequip - tell the player.
                    * Note this could be annoying if this is just one of a few,
                    * so it may not be critical (eg, putting on a ring and you have
                    * one cursed ring.)
                    */
-                  new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
+                  who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
                 }
               last = tmp->below;
             }
           /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
       if (basic_flag == AP_APPLY)
         return 0;
       if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
         {
-          new_draw_info_format (NDI_UNIQUE, 0, who,
+          who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
-                                "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
-                                query_name (op));
           return 1;
         }
       return unapply_special (who, op, aflags);
     }
   /* Can't just apply this object.  Lets see what not and what to do */
   if (int i = can_apply_object (who, op))
     {
       if (i & CAN_APPLY_NEVER)
         {
-          new_draw_info_format (NDI_UNIQUE, 0, who,
+          who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
-                                "You don't have the body to use a %s. H<You can never apply this item.>",
-                                query_name (op));
           return 1;
         }
       else if (i & CAN_APPLY_RESTRICTION)
         {
-          new_draw_info_format (NDI_UNIQUE, 0, who,
+          who->failmsg (format (
-                                "You have a prohibition against using a %s. "
+            "You have a prohibition against using a %s. "
-                                "H<Your belief, profession or class prevents you from applying this item.>",
+            "H<Your belief, profession or class prevents you from applying this item.>",
-                                query_name (op));
+            query_name (op)
+          ));
           return 1;
         }
       if (who->type != PLAYER)
         {
         }
       else
         {
           if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
             {
-              new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
+              who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
               unapply_for_ob (who, op, AP_PRINT);
               return 1;
             }
           else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
             if (unapply_for_ob (who, op, aflags))
     {
       skop = find_skill_by_name (who, op->skill);
       if (!skop)
         {
-          new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
+          who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
           return 1;
         }
       else
         /* While experience will be credited properly, we want to change the
          * skill so that the dam and wc get updated
   if (who->type == PLAYER
       && op->item_power
       && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
     {
-      new_draw_info (NDI_UNIQUE, 0, who,
-                     "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
+      who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
       return 1;
     }
   /* Ok.  We are now at the state where we can apply the new object.
    * Note that we don't have the checks for can_use_...
   switch (op->type)
     {
       case WEAPON:
         if (!check_weapon_power (who, op->last_eat))
           {
-            new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
+            op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
-                                               "It would consume your soul!." LACK_ITEM_POWER);
             if (tmp)
               insert_ob_in_ob (tmp, who);
             return 1;
         // i.e. "R" can use Ragnarok's sword.
         if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
           {
             /* if the weapon does not have the name as the character, can't use it. */
             /* (Ragnarok's sword attempted to be used by Foo: won't work) */
-            new_draw_info (NDI_UNIQUE, 0, who,
+            who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
-                           "The weapon does not recognize you as its owner. "
-                           "H<Its name indicates that it belongs to somebody else.>");
             if (tmp)
               insert_ob_in_ob (tmp, who);
             return 1;
           }
         if (!skop)
           {
-            new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
+            who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
             return 1;
           }
         SET_FLAG (op, FLAG_APPLIED);
         who->change_skill (skop);
         if (who->contr)
           who->change_weapon (who->contr->combat_ob = op);
-        new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
+        who->statusmsg (format ("You wield %s.", query_name (op)));
         SET_FLAG (who, FLAG_READY_WEAPON);
         change_abil (who, op);
         break;
       case BRACERS:
       case CLOAK:
       case RING:
       case AMULET:
         SET_FLAG (op, FLAG_APPLIED);
-        new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
+        who->statusmsg (format ("You wear %s.", query_name (op)));
         change_abil (who, op);
         break;
       case LAMP:
         if (op->stats.food < 1)
           {
-            new_draw_info_format (NDI_UNIQUE, 0, who,
+            who->failmsg (format (
-                                  "Your %s is out of fuel! "
+              "Your %s is out of fuel! "
-                                  "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
+              "H<Lamps and similar items need fuel. They cannot be refilled.>",
+              &op->name
+            ));
             return 1;
           }
-        new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
+        who->statusmsg (format ("You turn on your %s.", &op->name));
         tmp2 = arch_to_object (op->other_arch);
         tmp2->stats.food = op->stats.food;
         SET_FLAG (tmp2, FLAG_APPLIED);
         if (QUERY_FLAG (op, FLAG_INV_LOCKED))
         who->update_stats ();
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
           if (who->type == PLAYER)
             {
-              new_draw_info (NDI_UNIQUE, 0, who,
-                             "Oops, it feels deadly cold! "
-                             "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
+              who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
               SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
             }
         if (who->type == PLAYER)
           esrv_send_item (who, tmp2);
                               who->change_weapon (pl->combat_ob = item);
                               goto found_weapon;
                             }
                         }
-                    new_draw_info_format (NDI_UNIQUE, 0, who,
+                    who->failmsg (format (
-                                          "You need to apply a '%s' melee weapon before readying this skill. "
+                      "You need to apply a '%s' melee weapon before readying this skill. "
-                                          "H<Some skills need an item, in this case a melee weapon, to function.>",
+                      "H<Some skills need an item, in this case a melee weapon, to function.>",
-                                          &op->skill);
+                      &op->skill
+                    ));
                     return 1;
                     found_weapon:;
                   }
                 else
                           //TODO: bows should/must all have skill missile weapon right now
                           who->change_weapon (pl->ranged_ob = item);
                           goto found_bow;
                         }
-                    new_draw_info (NDI_UNIQUE, 0, who,
+                    who->failmsg (
-                                   "You need to apply a missile weapon before readying this skill. "
+                      "You need to apply a missile weapon before readying this skill. "
-                                   "H<Some skills need an item, in this case a missile weapon, to function.>");
+                      "H<Some skills need an item, in this case a missile weapon, to function.>"
+                    );
                     return 1;
                     found_bow:;
                   }
                 else
                   who->change_weapon (pl->ranged_ob = op);
               }
             if (!op->invisible)
               {
-                new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
+                who->statusmsg (format (
-                new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
+                  "You ready %s."
+                  "You can now use the skill: %s.",
+                  query_name (op),
+                  &op->skill
+                ));
               }
             else
-              new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
+              who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
           }
         else
           {
             SET_FLAG (op, FLAG_APPLIED);
             change_abil (who, op);
         break;
       case BOW:
         if (!check_weapon_power (who, op->last_eat))
           {
-            new_draw_info (NDI_UNIQUE, 0, who,
-                           "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
+            who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
             if (tmp)
               insert_ob_in_ob (tmp, who);
             return 1;
           }
         if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
           {
-            new_draw_info (NDI_UNIQUE, 0, who,
-                           "The weapon does not recognize you as its owner. "
+            who->failmsg ("The weapon does not recognize you as its owner. "
                            "H<Its name indicates that it belongs to somebody else.>");
             if (tmp)
               insert_ob_in_ob (tmp, who);
             return 1;
       case HORN:
         /* check for skill, alter player status */
         if (!skop)
           {
-            new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
+            who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
             return 1;
           }
         SET_FLAG (op, FLAG_APPLIED);
         who->change_skill (skop);
         if (who->contr)
           {
             who->contr->ranged_ob = op;
-            new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
+            who->statusmsg (format ("You ready %s.", query_name (op)));
             if (op->type == BOW)
               {
                 who->current_weapon = op;
                 change_abil (who, op);
-                new_draw_info_format (NDI_UNIQUE, 0, who,
-                                      "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
+                who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
               }
           }
         else
           {
             if (op->type == BOW)
           {
             //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
             if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
               unapply_special (who, who->contr->ranged_ob, 0);
-            new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
+            who->statusmsg (format ("You ready your %s.", query_name (op)));
             who->contr->ranged_ob = op;
           }
         break;
       default:
-        new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
+        who->statusmsg (format ("You apply %s.", query_name (op)));
-    }                           /* end of switch op->type */
+    }
   SET_FLAG (op, FLAG_APPLIED);
   if (tmp)
     tmp = insert_ob_in_ob (tmp, who);
     SET_FLAG (op, FLAG_BEEN_APPLIED);
   if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
     if (who->type == PLAYER)
       {
-        new_draw_info (NDI_UNIQUE, 0, who,
+        who->failmsg (
-                       "Oops, it feels deadly cold! "
+          "Oops, it feels deadly cold! "
-                       "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
+          "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
+        );
         SET_FLAG (op, FLAG_KNOWN_CURSED);
       }
   if (who->type == PLAYER)
     {
     {
       if (QUERY_FLAG (food, FLAG_CURSED))
         {
           assign (who->contr->killer, food->name);
           hit_player (who, food->stats.hp, food, AT_POISON, 1);
-          new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
+          who->failmsg ("Eck!...that was poisonous!");
         }
       else
         {
           if (food->stats.hp > 0)
-            new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better.");
+            who->statusmsg ("You begin to feel better.");
           else
-            new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
+            who->failmsg ("Eck!...that was poisonous!");
           who->stats.hp += food->stats.hp;
         }
     }
   if (food->stats.sp != 0)
     {
       if (QUERY_FLAG (food, FLAG_CURSED))
         {
-          new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!");
+          who->failmsg ("You are drained of mana!");
           who->stats.sp -= food->stats.sp;
           if (who->stats.sp < 0)
             who->stats.sp = 0;
         }
       else
         {
-          new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
+          who->statusmsg ("You feel a rush of magical energy!");
           who->stats.sp += food->stats.sp;
           /* place limit on max sp from food? */
         }
     }
   who->update_stats ();
 }
 /**
  * Designed primarily to light torches/lanterns/etc.
             }
           else
             lighter->stats.food--;
         }
       else if (lighter->last_eat)
+        {
-        {                       /* no charges left in lighter */
+          /* no charges left in lighter */
-          new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
+          who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
           return;
         }
       /* Perhaps we should split what we are trying to light on fire?
        * I can't see many times when you would want to light multiple
       save_throw_object (item, AT_FIRE, who);
       if (item->destroyed ())
         {
-          new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
+          who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
           /* Need to update the player so that the players glow radius
            * gets changed.
            */
           if (is_player_env)
             who->update_stats ();
         }
       else
-        new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
+        who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
     }
-  else                          /* nothing to light */
+  else
-    new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object.");
+    who->failmsg ("You need to mark a lightable object.");
 }
 /**
  * op made some mistake with a scroll, this takes care of punishment.
   if (failure <= -1 && failure > -15)
     {                           /* wonder */
       object *tmp;
-      new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
+      op->failmsg ("Your spell warps!");
       tmp = get_archetype (SPELL_WONDER);
       cast_wonder (op, op, 0, tmp);
       tmp->destroy ();
     }
   else if (failure <= -15 && failure > -35)
     {                           /* drain mana */
-      new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
+      op->failmsg ("Your mana is drained!");
       op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
       if (op->stats.sp < 0)
         op->stats.sp = 0;
     }
   else if (settings.spell_failure_effects == TRUE)
     {
       if (failure <= -35 && failure > -60)
         {                       /* confusion */
-          new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
+          op->failmsg ("The magic recoils on you!");
           confuse_player (op, op, power);
         }
       else if (failure <= -60 && failure > -70)
         {                       /* paralysis */
-          new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!");
+          op->failmsg ("The magic recoils and paralyzes you!");
           paralyze_player (op, op, power);
         }
       else if (failure <= -70 && failure > -80)
         {                       /* blind */
-          new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
+          op->failmsg ("The magic recoils on you!");
           blind_player (op, op, power);
         }
       else if (failure <= -80)
         {                       /* blast the immediate area */
           object *tmp = get_archetype (LOOSE_MANA);
           cast_magic_storm (op, tmp, power);
-          new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
+          op->failmsg ("You unleash uncontrolled mana!");
           tmp->destroy ();
         }
     }
 }
   marked = find_marked_object (pl);
   if (!marked)
     {
-      new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
+      pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
       return;
     }
   if (!marked->slaying)
     {
-      new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
+      pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
       return;
     }
   /* check whether they are compatible or not */
   find = strstr (marked->slaying, transformer->arch->archname);
   if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
     {
-      new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
+      pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
       return;
     }
   find += strlen (transformer->arch->archname) + 1;
   /* Item can be used, now find how many and what it yields */
   else
     yield = 1;
   while (isdigit (*find))
     find++;
   while (*find == ' ')
     find++;
   memset (got, 0, MAX_BUF);
   /* Now create new item, remove used ones when required. */
   new_item = get_archetype (got);
   if (!new_item)
     {
-      pl->errormsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
+      pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
       return;
     }
   new_item->nrof = yield;

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.124 by root, Thu Aug 16 11:01:10 2007 UTC vs. Revision 1.125 by root, Thu Aug 16 11:34:29 2007 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.124 by root, Thu Aug 16 11:01:10 2007 UTC vs.
Revision 1.125 by root, Thu Aug 16 11:34:29 2007 UTC