Remove obsolete references to Glamour.

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

4 files changed, 2 insertions, 49 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 4c1fa40ed7..3dba4488b5 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -4041,8 +4041,7 @@
     { 8, 2, 4, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
     HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
-}
-,
+},
 
 {
     MONS_MERMAID, 'm', LIGHTCYAN, "mermaid",
@@ -4053,8 +4052,7 @@
     { 8, 2, 4, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
     HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
-}
-,
+},
 
 {
     MONS_GIANT_NEWT, 'l', LIGHTGREEN, "giant newt",
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 2615e8661e..4ddad9a084 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1089,22 +1089,6 @@ formatted_string describe_mutations()
         have_any = true;
         break;
 
-    case SP_GREY_ELF:
-        if (you.experience_level > 4)
-        {
-            result += "You are very charming." EOL;
-            have_any = true;
-        }
-        break;
-
-    case SP_HIGH_ELF:
-        if (you.experience_level > 14)
-        {
-            result += "You are very charming." EOL;
-            have_any = true;
-        }
-        break;
-
     case SP_KENKU:
         result += "You cannot wear helmets." EOL;
         if (you.experience_level > 4)
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index f894e5b16b..585ca6d078 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1712,22 +1712,6 @@ std::string status_mut_abilities()
           have_any = true;
           break;
 
-      case SP_GREY_ELF:
-          if (you.experience_level > 4)
-          {
-              text += "charming";
-              have_any = true;
-          }
-          break;
-
-      case SP_HIGH_ELF:
-          if (you.experience_level > 14)
-          {
-              text += "charming";
-              have_any = true;
-          }
-          break;
-
       case SP_KENKU:
           text += "cannot wear helmets";
           if (you.experience_level > 4)
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d8ecc86e4d..a07df63fe7 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2773,12 +2773,6 @@ void level_change(bool skip_ability_increase)
                 break;
 
             case SP_HIGH_ELF:
-                if (you.experience_level == 15)
-                {
-                    //jmf: got Glamour ability
-                    mpr("You feel charming!", MSGCH_INTRINSIC_GAIN);
-                }
-
                 if (you.experience_level % 3)
                     hp_adjust--;
 
@@ -2794,13 +2788,6 @@ void level_change(bool skip_ability_increase)
                 break;
 
             case SP_GREY_ELF:
-                if (you.experience_level == 5)
-                {
-                    //jmf: got Glamour ability
-                    mpr("You feel charming!", MSGCH_INTRINSIC_GAIN);
-                    mp_adjust++;
-                }
-
                 if (you.experience_level < 14)
                     hp_adjust--;