0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #18680 Plague no longer works

Browse source 
...by changing a comparison from z_empty to z_null.
Removed an unused reference to poison string.
This commit is contained in:
Thonsew 2011-09-24 19:03:16 +00:00
parent 96d5e7a88b
commit 6b330e2e41
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/actions.cpp
View file

@ -1032,6 +1032,7 @@ battle_context_unit_stats::battle_context_unit_stats(const unit &u, const map_lo
swarm_max(0),
plague_type()
{
static const config::t_token & z_null( generate_safe_static_const_t_interned(n_token::t_token("null")) );
static const config::t_token & z_not_living( generate_safe_static_const_t_interned(n_token::t_token("not_living")) );
static const config::t_token & z_slow( generate_safe_static_const_t_interned(n_token::t_token("slow")) );
static const config::t_token & z_drains( generate_safe_static_const_t_interned(n_token::t_token("drains")) );
@ -1090,10 +1091,10 @@ battle_context_unit_stats::battle_context_unit_stats(const unit &u, const map_lo
// Handle plague.
unit_ability_list plague_specials = weapon->get_specials(z_plague);
plagues = !not_living && !plague_specials.empty() &&
(opp.undead_variation() != n_token::t_token::z_empty()) && !resources::game_map->is_village(opp_loc);
(opp.undead_variation() != z_null) && !resources::game_map->is_village(opp_loc);
if (plagues) {
plague_type = (*plague_specials.cfgs.front().first)[z_type].str();
plague_type = (*plague_specials.cfgs.front().first)[z_type].token();
if (plague_type.empty())
plague_type = u.type_id();
}
@ -1632,7 +1633,7 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context &stats)
game_events::entity_location death_loc(defender.loc_, defender.id_);
game_events::entity_location attacker_loc(attacker.loc_, attacker.id_);
std::string undead_variation = defender.get_unit().undead_variation();
n_token::t_token undead_variation = defender.get_unit().undead_variation();
fire_event(z_attack_end);
refresh_bc();
@ -1749,7 +1750,6 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context &stats)
void attack::perform()
{
static const config::t_token & z_attack( generate_safe_static_const_t_interned(n_token::t_token("attack")) );
static const config::t_token & z_poison( generate_safe_static_const_t_interned(n_token::t_token("poison")) );
// Stop the user from issuing any commands while the units are fighting
const events::command_disabler disable_commands;
@ -1820,8 +1820,6 @@ void attack::perform()
const int attacker_side = a_.get_unit().side();
const int defender_side = d_.get_unit().side();
static const std::string poison_string(z_poison);
LOG_NG << "Fight: (" << a_.loc_ << ") vs (" << d_.loc_ << ") ATT: " << a_stats_->weapon->name() << " " << a_stats_->damage << "-" << a_stats_->num_blows << "(" << a_stats_->chance_to_hit << "%) vs DEF: " << (d_stats_->weapon ? d_stats_->weapon->name() : "none") << " " << d_stats_->damage << "-" << d_stats_->num_blows << "(" << d_stats_->chance_to_hit << "%)" << (defender_strikes_first ? " defender first-strike" : "") << "\n";
// Play the pre-fight animation

2
src/actions.hpp
View file

@ -158,7 +158,7 @@ struct battle_context_unit_stats
unsigned int swarm_min; /**< Minimum number of blows with swarm (equal to num_blows if swarm isn't used). */
unsigned int swarm_max; /**< Maximum number of blows with swarm (equal to num_blows if swarm isn't used). */
std::string plague_type; /**< The plague type used by the attack, if any. */
n_token::t_token plague_type; /**< The plague type used by the attack, if any. */
battle_context_unit_stats(const unit &u, const map_location& u_loc,
int u_attack_num, bool attacking,