From 24fa1749d2dc82f57d5ce04655f8d934ea767d14 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 4 Dec 2009 09:14:26 +0100 Subject: De-duplicate magic res and stealth adjective choice. --- crawl-ref/source/describe.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'crawl-ref/source/describe.cc') diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index b4ef97cf18..e77ff17982 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -33,13 +33,14 @@ #include "itemname.h" #include "itemprop.h" #include "items.h" +#include "jobs.h" #include "macro.h" #include "menu.h" #include "message.h" #include "mon-stuff.h" #include "mon-util.h" #include "newgame.h" -#include "jobs.h" +#include "output.h" #include "player.h" #include "random.h" #include "religion.h" @@ -2738,15 +2739,7 @@ static std::string _monster_stat_description(const monsters& mon) if (mr >= 10) { result << pronoun << make_stringf(" is %s resistant to magic.$", - (mr < 30) ? "slightly" : - (mr < 60) ? "somewhat" : - (mr < 90) ? "quite" : - (mr < 120) ? "very" : - (mr < 150) ? "extremely" : - (mr < 190) ? "extraordinarily" : - (mr < 240) ? "incredibly" : - (mr < 300) ? "uncannily" - : "almost entirely"); + magic_res_adjective(mr).c_str()); } } -- cgit v1.2.3-54-g00ecf