diff -udprBb --exclude='*.o' --exclude='*.raw' tome-225-src/src/melee2.c floor_patch/src/melee2.c
--- tome-225-src/src/melee2.c 2003-12-11 13:32:40.000000000 -0700
+++ floor_patch/src/melee2.c 2004-01-29 19:46:36.000000000 -0700
@@ -1170,7 +1181,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons an animal!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons an animal!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2249,7 +2260,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons some animals!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons some animals!", m_name);
for (k = 0; k < 4; k++)
{
if (friendly)
@@ -2416,7 +2427,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons a Thunderlord!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons a Thunderlord!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2433,7 +2444,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons %s %s.",
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons %s %s.",
m_name, m_poss,
((r_ptr->flags1) & RF1_UNIQUE ?
"minions" : "kin"));
@@ -2456,7 +2467,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons greater demons!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons greater demons!", m_name);
if (blind && count) monster_msg("You hear heavy steps nearby.");
if (friendly)
summon_specific_friendly(y, x, rlev, SUMMON_HI_DEMON, TRUE);
@@ -2470,7 +2481,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons help!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons help!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2487,7 +2498,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons monsters!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons monsters!", m_name);
for (k = 0; k < 8; k++)
{
if (friendly)
@@ -2504,7 +2515,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons ants.", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons ants.", m_name);
for (k = 0; k < 6; k++)
{
if (friendly)
@@ -2521,7 +2532,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons spiders.", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons spiders.", m_name);
for (k = 0; k < 6; k++)
{
if (friendly)
@@ -2538,7 +2549,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons hounds.", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons hounds.", m_name);
for (k = 0; k < 6; k++)
{
if (friendly)
@@ -2555,7 +2566,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons hydras.", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons hydras.", m_name);
for (k = 0; k < 6; k++)
{
if (friendly)
@@ -2572,7 +2583,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons an angel!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons an angel!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2589,7 +2600,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons a demon from the Courts of Chaos!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons a demon from the Courts of Chaos!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2606,7 +2617,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons an undead adversary!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons an undead adversary!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2623,7 +2634,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons a dragon!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons a dragon!", m_name);
for (k = 0; k < 1; k++)
{
if (friendly)
@@ -2640,7 +2651,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons greater undead!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons greater undead!", m_name);
for (k = 0; k < 8; k++)
{
if (friendly)
@@ -2660,7 +2671,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons ancient dragons!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons ancient dragons!", m_name);
for (k = 0; k < 8; k++)
{
if (friendly)
@@ -2680,7 +2691,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons a wraith!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons a wraith!", m_name);
for (k = 0; k < 8; k++)
@@ -2708,7 +2719,7 @@ static bool monst_spell_monst(int m_idx)
{
if (disturb_other) disturb(1, 0);
if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
- else monster_msg("%^s magically summons special opponents!", m_name);
+ else cmonster_msg(TERM_YELLOW,"%^s magically summons special opponents!", m_name);
for (k = 0; k < 8; k++)
{
if (!friendly)
@@ -3188,7 +3199,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons an animal!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons an animal!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_ANIMAL);
@@ -4221,7 +4232,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons some animals!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons some animals!", m_name);
for (k = 0; k < 4; k++)
{
count += summon_specific(y, x, rlev, SUMMON_ANIMAL);
@@ -4368,7 +4379,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons a Thunderlord!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons a Thunderlord!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_THUNDERLORD);
@@ -4382,7 +4393,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons %s %s.",
+ else cmsg_format(TERM_YELLOW,"%^s magically summons %s %s.",
m_name, m_poss,
((r_ptr->flags1) & RF1_UNIQUE ?
"minions" : "kin"));
@@ -4402,7 +4413,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons greater demons!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons greater demons!", m_name);
if (blind && count) msg_print("You hear heavy steps nearby.");
summon_cyber();
break;
@@ -4413,7 +4424,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons help!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons help!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, 0);
@@ -4427,7 +4438,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons monsters!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons monsters!", m_name);
for (k = 0; k < 8; k++)
{
count += summon_specific(y, x, rlev, 0);
@@ -4441,7 +4452,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons ants.", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons ants.", m_name);
for (k = 0; k < 6; k++)
{
count += summon_specific(y, x, rlev, SUMMON_ANT);
@@ -4455,7 +4466,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons spiders.", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons spiders.", m_name);
for (k = 0; k < 6; k++)
{
count += summon_specific(y, x, rlev, SUMMON_SPIDER);
@@ -4469,7 +4480,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons hounds.", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons hounds.", m_name);
for (k = 0; k < 6; k++)
{
count += summon_specific(y, x, rlev, SUMMON_HOUND);
@@ -4483,7 +4494,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons hydras.", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons hydras.", m_name);
for (k = 0; k < 6; k++)
{
count += summon_specific(y, x, rlev, SUMMON_HYDRA);
@@ -4497,7 +4508,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons an angel!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons an angel!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_ANGEL);
@@ -4511,7 +4522,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons a demon from the Courts of Chaos!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons a demon from the Courts of Chaos!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_DEMON);
@@ -4525,7 +4536,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons an undead adversary!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons an undead adversary!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_UNDEAD);
@@ -4539,7 +4550,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons a dragon!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons a dragon!", m_name);
for (k = 0; k < 1; k++)
{
count += summon_specific(y, x, rlev, SUMMON_DRAGON);
@@ -4553,7 +4564,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons greater undead!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons greater undead!", m_name);
for (k = 0; k < 8; k++)
{
count += summon_specific(y, x, rlev, SUMMON_HI_UNDEAD);
@@ -4570,7 +4581,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons ancient dragons!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons ancient dragons!", m_name);
for (k = 0; k < 8; k++)
{
count += summon_specific(y, x, rlev, SUMMON_HI_DRAGON);
@@ -4587,7 +4598,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons Wraith!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons Wraith!", m_name);
for (k = 0; k < 8; k++)
@@ -4615,7 +4626,7 @@ bool make_attack_spell(int m_idx)
{
disturb(1, 0);
if (blind) msg_format("%^s mumbles.", m_name);
- else msg_format("%^s magically summons special opponents!", m_name);
+ else cmsg_format(TERM_YELLOW,"%^s magically summons special opponents!", m_name);
for (k = 0; k < 8; k++)
{
count += summon_specific(y, x, rlev, SUMMON_UNIQUE);
ToME Wiki