upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 18:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use print_modifier, not signed_value, when dealing with percentages.

Browse Source 
Fixes bug #21577.
This commit is contained in:
JaMiT 2014-02-25 22:10:05 -06:00
parent 9c08880d51
commit 5162b0584e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -17,6 +17,8 @@ Version 1.11.10+dev:
* Changed: Updated valgrind suppression file.
* Labels are now removed when shroud/fog is removed, rather than waiting
for a new turn (bug #21434).
* Percent signs show when describing traits that increase damage or attacks
by a percentage (bug #21577).
Version 1.11.10:
* Add-ons client:

2
players_changelog
View File

@ -18,6 +18,8 @@ Version 1.11.10+dev:
* Units can no longer be moved in linger mode (bug #21450).
* Labels are now removed when shroud/fog is removed, rather than waiting
for a new turn (bug #21434).
* Percent signs show when describing traits that increase damage or attacks
by a percentage (bug #21577).
Version 1.11.10:

8
src/unit_types.cpp
View File

@ -245,7 +245,7 @@ bool attack_type::apply_modification(const config& cfg,std::string* description)
if(description != NULL) {
int inc_damage = lexical_cast<int>(increase_damage);
desc << utils::signed_value(inc_damage) << " "
desc << utils::print_modifier(increase_damage) << " "
<< _n("damage","damage", inc_damage);
}
}
@ -256,7 +256,7 @@ bool attack_type::apply_modification(const config& cfg,std::string* description)
if(description != NULL) {
int inc_attacks = lexical_cast<int>(increase_attacks);
desc << utils::signed_value(inc_attacks) << " "
desc << utils::print_modifier(increase_attacks) << " "
<< _n("strike", "strikes", inc_attacks);
}
}
@ -326,13 +326,13 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(increase_damage.empty() == false) {
int inc_damage = lexical_cast<int>(increase_damage);
desc << utils::signed_value(inc_damage) << " "
desc << utils::print_modifier(increase_damage) << " "
<< _n("damage","damage", inc_damage);
}
if(increase_attacks.empty() == false) {
int inc_attacks = lexical_cast<int>(increase_attacks);
desc << utils::signed_value(inc_attacks) << " "
desc << utils::print_modifier(increase_attacks) << " "
<< _n("strike", "strikes", inc_attacks);
}