diff options
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 1f41182a3e..44bfc24e7d 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1867,7 +1867,7 @@ static void focus_card(int power, deck_rarity_type rarity) (*base_statp[worst_stat])--; // Did focusing kill the player? - kill_method_type kill_types[3] = { + const kill_method_type kill_types[3] = { KILLED_BY_WEAKNESS, KILLED_BY_CLUMSINESS, KILLED_BY_STUPIDITY @@ -1878,19 +1878,14 @@ static void focus_card(int power, deck_rarity_type rarity) if (crawl_state.is_god_acting()) { god_type which_god = crawl_state.which_god_acting(); - if (crawl_state.is_god_retribution()) { - cause = "the wrath of "; - cause += god_name(which_god); - } + if (crawl_state.is_god_retribution()) + cause = "the wrath of " + god_name(which_god); else { if (which_god == GOD_XOM) cause = "the capriciousness of Xom"; else - { - cause = "the 'helpfullness' of "; - cause += god_name(which_god); - } + cause = "the 'helpfullness' of " + god_name(which_god); } } @@ -1940,19 +1935,14 @@ static void shuffle_card(int power, deck_rarity_type rarity) if (crawl_state.is_god_acting()) { god_type which_god = crawl_state.which_god_acting(); - if (crawl_state.is_god_retribution()) { - cause = "the wrath of "; - cause += god_name(which_god); - } + if (crawl_state.is_god_retribution()) + cause = "the wrath of " + god_name(which_god); else { if (which_god == GOD_XOM) cause = "the capriciousness of Xom"; else - { - cause = "the 'helpfulness' of "; - cause += god_name(which_god); - } + cause = "the 'helpfulness' of " + god_name(which_god); } } |