summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/jobs.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2011-02-09 21:27:42 +0000
committerChris Campbell <chriscampbell89@gmail.com>2011-02-18 06:27:19 +0000
commit9d8a9bff0b1fdc5416628ab0e42487ce9dc0a8b7 (patch)
tree397896b8c33166276e7447fac0568e777f92a617 /crawl-ref/source/jobs.cc
parentfe0f9defb0c538cf9e8af9c8b2a60b8ea37dd591 (diff)
downloadcrawl-ref-9d8a9bff0b1fdc5416628ab0e42487ce9dc0a8b7.tar.gz
crawl-ref-9d8a9bff0b1fdc5416628ab0e42487ce9dc0a8b7.zip
Remove paladins at the next major save version
Diffstat (limited to 'crawl-ref/source/jobs.cc')
-rw-r--r--crawl-ref/source/jobs.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/jobs.cc b/crawl-ref/source/jobs.cc
index 22ee083eb7..12b5e3fe1a 100644
--- a/crawl-ref/source/jobs.cc
+++ b/crawl-ref/source/jobs.cc
@@ -11,7 +11,7 @@ static job_type jobs_order[] = {
JOB_FIGHTER, JOB_GLADIATOR,
JOB_MONK, JOB_BERSERKER,
// religious professions (incl. Berserker above)
- JOB_PALADIN, JOB_PRIEST,
+ JOB_PRIEST,
JOB_HEALER, JOB_CHAOS_KNIGHT,
JOB_CRUSADER,
// general and niche spellcasters (incl. Crusader above)
@@ -38,7 +38,11 @@ job_type get_job(const int index)
static const char * Job_Abbrev_List[ NUM_JOBS ] =
{ "Fi", "Wz", "Pr",
- "Gl", "Ne", "Pa", "As", "Be", "Hu",
+ "Gl", "Ne",
+#if TAG_MAJOR_VERSION == 32
+ "Pa",
+#endif
+ "As", "Be", "Hu",
"Cj", "En", "FE", "IE", "Su", "AE", "EE", "Cr",
"VM",
"CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn", "Ar", "AM" };
@@ -46,7 +50,10 @@ static const char * Job_Abbrev_List[ NUM_JOBS ] =
static const char * Job_Name_List[ NUM_JOBS ] =
{ "Fighter", "Wizard", "Priest",
"Gladiator", "Necromancer",
- "Paladin", "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
+#if TAG_MAJOR_VERSION == 32
+ "Paladin",
+#endif
+ "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
"Fire Elementalist", "Ice Elementalist", "Summoner", "Air Elementalist",
"Earth Elementalist", "Crusader",
"Venom Mage",