summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-03 18:33:51 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-03 18:33:51 +0000
commit610652dba6b72b800879510c3e715c1aeb4e5747 (patch)
tree31c769873b1e5a64e6fef58b8cfff0fcc144c262
parent3e012fbd5bca5503092784b4c74642df4c58d16d (diff)
downloadcrawl-ref-610652dba6b72b800879510c3e715c1aeb4e5747.tar.gz
crawl-ref-610652dba6b72b800879510c3e715c1aeb4e5747.zip
Properly rename the last holy being neutrality function (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3513 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/religion.cc2
-rw-r--r--crawl-ref/source/religion.h2
-rw-r--r--crawl-ref/source/view.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 2672d6a23d..71973f71a1 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3079,7 +3079,7 @@ static void beogh_orc_spontaneous_conversion_speech(
}
}
-void good_god_convert_holy(monsters *holy)
+void good_god_holy_attitude_change(monsters *holy)
{
ASSERT(mons_class_holiness(holy->type) == MH_HOLY);
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 147022b21b..f780342309 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -63,7 +63,7 @@ void divine_retribution(god_type god);
bool beogh_water_walk();
void beogh_idol_revenge();
-void good_god_convert_holy(monsters *holy);
+void good_god_holy_attitude_change(monsters *holy);
void beogh_convert_orc(monsters *orc, bool emergency);
bool is_evil_weapon(const item_def& weap);
bool ely_destroy_weapons();
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 48615075a9..ce12258d1e 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -775,7 +775,7 @@ static void good_god_follower_attitude_change(monsters *monster)
<< std::endl;
return;
}
- good_god_convert_holy(monster);
+ good_god_holy_attitude_change(monster);
stop_running();
}
}