diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-20 14:36:41 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-20 14:36:41 +0000 |
| commit | fa105771ecd200166baa87881b5ca8f68ede9a58 (patch) | |
| tree | 241f7af2339e6364b77d94bf80d8702dd58b948b /crawl-ref/source/output.cc | |
| parent | 73cc0b892413b1d8df2178ce3116266a9066384f (diff) | |
| download | crawl-ref-fa105771ecd200166baa87881b5ca8f68ede9a58.tar.gz crawl-ref-fa105771ecd200166baa87881b5ca8f68ede9a58.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9796 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 6080480ec3..4b366828dc 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1880,9 +1880,13 @@ static std::vector<formatted_string> _get_overview_stats() // 4 columns column_composer cols1(4, 18, 28, 40); - const bool boosted_hp = you.duration[DUR_DIVINE_VIGOUR] - || you.duration[DUR_BERSERKER]; - const bool boosted_mp = you.duration[DUR_DIVINE_VIGOUR]; + const bool boosted_hp = you.duration[DUR_DIVINE_VIGOUR] + || you.duration[DUR_BERSERKER]; + const bool boosted_mp = you.duration[DUR_DIVINE_VIGOUR]; + const bool boosted_str = you.duration[DUR_DIVINE_STAMINA] + || you.duration[DUR_MIGHT]; + const bool boosted_int = you.duration[DUR_DIVINE_STAMINA]; + const bool boosted_dex = you.duration[DUR_DIVINE_STAMINA]; if (!player_rotted()) { @@ -1935,7 +1939,7 @@ static std::vector<formatted_string> _get_overview_stats() if (you.strength == you.max_strength) { - if (you.duration[DUR_DIVINE_STAMINA] || you.duration[DUR_MIGHT]) + if (boosted_str) { snprintf(buf, sizeof buf, "Str <lightblue>%2d</lightblue>", you.strength); @@ -1945,7 +1949,7 @@ static std::vector<formatted_string> _get_overview_stats() } else { - if (you.duration[DUR_DIVINE_STAMINA] || you.duration[DUR_MIGHT]) + if (boosted_str) { snprintf(buf, sizeof buf, "Str <lightblue>%2d (%d)</lightblue>", you.strength, you.max_strength); @@ -1958,7 +1962,7 @@ static std::vector<formatted_string> _get_overview_stats() if (you.intel == you.max_intel) { - if (you.duration[DUR_DIVINE_STAMINA]) + if (boosted_int) { snprintf(buf, sizeof buf, "Int <lightblue>%2d</lightblue>", you.intel); @@ -1968,7 +1972,7 @@ static std::vector<formatted_string> _get_overview_stats() } else { - if (you.duration[DUR_DIVINE_STAMINA]) + if (boosted_int) { snprintf(buf, sizeof buf, "Int <lightblue>%2d (%d)</lightblue>", you.intel, you.max_intel); @@ -1981,7 +1985,7 @@ static std::vector<formatted_string> _get_overview_stats() if (you.dex == you.max_dex) { - if (you.duration[DUR_DIVINE_STAMINA]) + if (boosted_dex) { snprintf(buf, sizeof buf, "Dex <lightblue>%2d</lightblue>", you.dex); @@ -1991,7 +1995,7 @@ static std::vector<formatted_string> _get_overview_stats() } else { - if (you.duration[DUR_DIVINE_STAMINA]) + if (boosted_dex) { snprintf(buf, sizeof buf, "Dex <lightblue>%2d (%d)</lightblue>", you.dex, you.max_dex); |