Remove extraneous references to god_gives_permanent_followers().

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

4 files changed, 1 insertions, 23 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 2714b4945c..4c790d439d 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1924,14 +1924,6 @@ void process_command( command_type cmd )
         // Toggle pickup mode for friendlies.
         _print_friendly_pickup_setting(false);
 
-        if (Options.tutorial_left
-            && !god_gives_permanent_followers(you.religion))
-        {
-            mpr("Only intelligent allies may equip themselves, which excludes "
-                "all types of zombies as well as hostile monsters you "
-                "enslaved.", MSGCH_TUTORIAL);
-        }
-
         mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ",
             MSGCH_PROMPT);
 
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 5831e431db..26ae1fd3a4 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2028,8 +2028,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
     if (newlevel)
     {
         // When entering a new level, reset friendly_pickup to default.
-        if (god_gives_permanent_followers(you.religion))
-            you.friendly_pickup = Options.default_friendly_pickup;
+        you.friendly_pickup = Options.default_friendly_pickup;
 
         switch (you.level_type)
         {
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 0a764d40ed..11592f7a95 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -435,18 +435,6 @@ bool is_priest_god(god_type god)
             || god == GOD_BEOGH);
 }
 
-bool god_gives_permanent_followers(god_type god)
-{
-    // Only TSO, Yredelemnul, Kikubaaqudgha and Beogh do this, but if you
-    // switch from TSO to another good god, you keep your (non-daeva) permanent
-    // followers, so count the other good gods here as well.
-    return (god == GOD_SHINING_ONE
-            || god == GOD_BEOGH
-            || god == GOD_YREDELEMNUL
-            || god == GOD_KIKUBAAQUDGHA
-            || you.worshipped[GOD_SHINING_ONE] && is_good_god(god));
-}
-
 std::string get_god_powers(god_type which_god)
 {
     // Return early for the special cases.
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index d26533e87a..03e30ce72e 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -51,7 +51,6 @@ bool is_evil_god(god_type god);
 bool is_good_god(god_type god);
 bool is_chaotic_god(god_type god);
 bool is_priest_god(god_type god);
-bool god_gives_permanent_followers(god_type god);
 void simple_god_message(const char *event, god_type which_deity = you.religion);
 int piety_breakpoint(int i);
 std::string god_name(god_type which_god, bool long_name = false);