Remove SPFLAG_DEVEL and the only spell that had it set, Disrupt.

4 files changed, 4 insertions, 36 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 3a34671f22..2dba6303a7 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1061,8 +1061,7 @@ static bool _spell_filter(std::string key, std::string body)
     if (spell == SPELL_NO_SPELL)
         return (true);
 
-    if (get_spell_flags(spell) & (SPFLAG_MONSTER | SPFLAG_TESTING
-                                  | SPFLAG_DEVEL))
+    if (get_spell_flags(spell) & (SPFLAG_MONSTER | SPFLAG_TESTING))
     {
 #ifdef WIZARD
         return (!you.wizard);
@@ -1166,12 +1165,7 @@ static void _append_non_item(std::string &desc, std::string key)
 
     unsigned int flags = get_spell_flags(type);
 
-    if (flags & SPFLAG_DEVEL)
-    {
-        desc += "$This spell is still being developed, and is only available "
-                "via the &Z wizard command.";
-    }
-    else if (flags & SPFLAG_TESTING)
+    if (flags & SPFLAG_TESTING)
     {
         desc += "$This is a testing spell, only available via the "
                 "&Z wizard command.";
@@ -1198,7 +1192,7 @@ static void _append_non_item(std::string &desc, std::string key)
     if (true)
 #endif
     {
-        if (flags & (SPFLAG_TESTING | SPFLAG_MONSTER | SPFLAG_DEVEL))
+        if (flags & (SPFLAG_TESTING | SPFLAG_MONSTER))
         {
             desc += "$$You aren't in wizard mode, so you shouldn't be "
                     "seeing this entry.  Please file a bug report.";
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index fcac1faa6a..52533d386c 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -2163,18 +2163,6 @@ static void _get_spell_list(std::vector<spell_type> &spell_list, int level,
             }
         }
 
-        // Only wizard mode gets spells still under development.
-        const unsigned int flags = get_spell_flags(spell);
-        if (flags & SPFLAG_DEVEL)
-        {
-#ifdef WIZARD
-            if (!you.wizard)
-                continue;
-#else
-            continue;
-#endif
-        }
-
         if (avoid_uncastable && you_cannot_memorise(spell))
         {
             uncastable_discard++;
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index 348a2c5dea..d4ecf8a111 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -33,8 +33,7 @@ enum spflag_type
     SPFLAG_INNATE               = 0x08000,      // an innate spell, even if
                                                 // use by a priest/wizard
     SPFLAG_NOISY                = 0x10000,      // makes noise, even if innate
-    SPFLAG_TESTING              = 0x20000,      // a testing/debugging spell
-    SPFLAG_DEVEL                = 0x40000       // a spell under development
+    SPFLAG_TESTING              = 0x20000       // a testing/debugging spell
 };
 
 enum spret_type
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 066e0c100b..3fc9921689 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1378,19 +1378,6 @@
 },
 
 {
-    SPELL_DISRUPT, "Disrupt",
-     SPTYP_TRANSMUTATION,
-     SPFLAG_DIR_OR_TARGET | SPFLAG_BATTLE | SPFLAG_DEVEL,
-     1,
-     25,
-     7, 7,
-     0,
-     NULL,
-     false,
-     false
-},
-
-{
     SPELL_DISINTEGRATE, "Disintegrate",
      SPTYP_TRANSMUTATION,
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_CARD, // also: wand