s/Ogre Mage/Ogre-Mage

and beholding should not allow swapping with friendlies (Bug 1739619).


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2853 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 9 insertions, 8 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 6da42db997..0a761423c1 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -731,7 +731,7 @@ their claws, so do not need a cutting device. Also Trolls, Orcs,
 Ogres, and Kobolds care less (in different degrees) about the quality
 of the corpse. Ogres, Trolls and Kobolds are happy to eat raw meat at
 any time. This does not apply to the more civilised (and more
-pretentious) Ogre Mages.
+pretentious) Ogre-Mages.
 
 ? Magical Scrolls:
 ------------------
@@ -1453,7 +1453,7 @@ at moving unnoticed.
 Every now and then, a naga can spit poison; the range, accuracy and
 damage of this poison increases with the naga's experience level.
 
-Ogres and Ogre Mages:
+Ogres and Ogre-Mages:
 ---------------------
 Genealogists would call these species Common Ogres and Sapient Ogres rather, 
 yet the folklore labels stuck somehow. These two are genuinely different 
@@ -1469,12 +1469,12 @@ Because of their large size they can only wear loose robes, cloaks and
 animal skins. Although ogres can eat almost anything, their size also 
 means that they need to do so more frequently than smaller folk.
 
-Ogre Mages are slightly smaller and nimbler than their Common 
+Ogre-Mages are slightly smaller and nimbler than their Common 
 counterparts and grow a bit slower. They are unique among the beefier 
 species in their ability to use magic, especially enchantments. Still, 
 they also perform well in all types of melee combat, with a slight 
 disadvantage at short blades. While they perform better than Ogres in all 
-more civilised aspects of life, Ogre Mages have lost the ability to 
+more civilised aspects of life, Ogre-Mages have lost the ability to 
 digest raw meat when not hungry.
 
 Most often, small bands of Common Ogres raid the countryside or
diff --git a/crawl-ref/docs/tables.txt b/crawl-ref/docs/tables.txt
index 12e0b78fbc..38f187a3c6 100644
--- a/crawl-ref/docs/tables.txt
+++ b/crawl-ref/docs/tables.txt
@@ -49,7 +49,7 @@ Naga            150 150  40 100 140 100   100 100                 120
 Gnome           150  70  70  80 120  70   120  60                 110
 Ogre            140 150 200 150 110 200   130 170                 140
 Troll           150 130 250 150 150 200   150 180                 150
-Ogre Mage       170 130 100 130 150 150   100 100                 150
+Ogre-Mage       170 130 100 130 150 150   100 100                 150
 Draconian Red   200 120 120 100 100 100   100 100                 130
         White   200 120 120 100 100 100   100 100                 130
         Green   200 120 120 100 100 100   100 100                 130
@@ -88,7 +88,7 @@ Naga            100 100 100 100 100 100 120 100   120 120 120 120 120
 Gnome           100  75 100 100 130 140 130 110   100  80 100  90  60
 Ogre            100 140 120 100 100 110 120 130   100 150 150 180 150
 Troll           140 150 150 150 130 150 150 100   130 180 180 180 180
-Ogre Mage       100 110 100 100 100 100 100 100   150 150 150 150 150
+Ogre-Mage       100 110 100 100 100 100 100 100   150 150 150 150 150
 Draconian Red    90 100 100 100 100 100 100 100   120 120 120 120 120
         White    90 100 100 100 100 100 100 100   120 120 120 120 120
         Green    90 100 100 100 100 100 100 100   120 120 120 120 120
@@ -127,7 +127,7 @@ Naga            100 100 100 100 100 100 100 100   100 100 100 100  60
 Gnome           120 100 100 110 130 130 120 120   100 100 170  60 130
 Ogre            220 180 220 200 150 200 200 200   150 150 200 120 150
 Troll           200 160 200 160 150 160 160 200   160 160 200 120 160
-Ogre Mage        70 100  80 100 100 100 100 100   100 100 100 100 100
+Ogre-Mage        70 100  80 100 100 100 100 100   100 100 100 100 100
 Draconian Red   100 100 120 100 100 100 100 100    70 135 100 100 100
         Green   100 100 120 100 100 100 100 100   100 100 100 100  70
         White   100 100 120 100 100 100 100 100   135  70 100 100 100
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 24746d3c65..1cf4e1130a 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3691,7 +3691,8 @@ static void move_player(int move_x, int move_y)
 
     // cannot move away from mermaid but you CAN fight neighbouring squares
     if (you.duration[DUR_BEHELD] && !you.duration[DUR_CONF]
-        && (targ_monst == NON_MONSTER || mons_is_submerged(&menv[targ_monst])))
+        && (targ_monst == NON_MONSTER || mons_friendly(&menv[targ_monst])
+            || mons_is_submerged(&menv[targ_monst])))
     {   
         for (unsigned int i = 0; i < you.beheld_by.size(); i++)
         {