upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 21:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken 2008-09-08T19:35:21Z!shadowm@wesnoth.org

Browse Source
This commit is contained in:
Ignacio R. Morelle 2008-09-08 20:29:08 +00:00
parent 5e2180cef3
commit 070a207707
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/actions.cpp
View File

@ -1044,20 +1044,20 @@ attack::attack(game_display& gui, const gamemap& map,
if(hits) {
if (a_stats_->poisons &&
!utils::string_bool(d_->second.get_state("poisoned"))) {
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^poisoned") : _("poisoned")) +
"\n";
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^poisoned") : _("poisoned"));
float_text += '\n';
}
if(a_stats_->slows && !utils::string_bool(d_->second.get_state("slowed"))) {
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^slowed") : _("slowed")) +
"\n";
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^slowed") : _("slowed"));
float_text += '\n';
}
// If the defender is turned to stone, the fight stops immediately
static const std::string stone_string("stone");
if (a_stats_->stones) {
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^stone") : _("stone")) +
"\n";
float_text += (d_->second.gender() == unit_race::FEMALE ? _("female^stone") : _("stone"));
float_text += '\n';
}
}
@ -1315,20 +1315,20 @@ attack::attack(game_display& gui, const gamemap& map,
if(hits) {
if (d_stats_->poisons &&
!utils::string_bool(a_->second.get_state("poisoned"))) {
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^poisoned") : _("poisoned")) +
"\n";
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^poisoned") : _("poisoned"));
float_text += '\n';
}
if(d_stats_->slows && !utils::string_bool(a_->second.get_state("slowed"))) {
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^slowed") : _("slowed")) +
"\n";
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^slowed") : _("slowed"));
float_text += '\n';
}
// If the defender is turned to stone, the fight stops immediately
static const std::string stone_string("stone");
if (d_stats_->stones) {
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^stone") : _("stone")) +
"\n";
float_text += (a_->second.gender() == unit_race::FEMALE ? _("female^stone") : _("stone"));
float_text += '\n';
}
}
unit_display::unit_attack(defender_,attacker_,