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

Made move_unit_fake work with variation=* specifier,

Browse source 
...and have an actual effect. Also, modified unit class constructor
accordingly, to make room for a variation parameter.

Also, removed an 'unused parameter: trait' warning on units.cpp,
unit::add_trait() function. Seems to have been used in code that is now
deprecated/commented there.
This commit is contained in:
Ignacio R. Morelle 2007-10-29 15:33:47 +00:00
parent 161129725e
commit 78cd318af3
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game_events.cpp
View file

@ -774,6 +774,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
std::string side = cfg["side"];
std::string x = cfg["x"];
std::string y = cfg["y"];
std::string variation = cfg["variation"];
wassert(state_of_game != NULL);
size_t side_num = lexical_cast_default<int>(side,1)-1;
@ -786,7 +787,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
wassert(units != NULL);
wassert(game_map != NULL);
wassert(status_ptr != NULL);
unit dummy_unit(game_data_ptr,units,game_map,status_ptr,teams,&itor->second,side_num+1,false,true,gender);
unit dummy_unit(game_data_ptr,units,game_map,status_ptr,teams,&itor->second,side_num+1,false,true,gender,variation);
const std::vector<std::string> xvals = utils::split(x);
const std::vector<std::string> yvals = utils::split(y);
std::vector<gamemap::location> path;

21
src/unit.cpp
View file

@ -218,6 +218,9 @@ void unit::clear_status_caches()
unit_race::GENDER unit::generate_gender(const unit_type& type, bool gen)
{
const std::vector<unit_race::GENDER>& genders = type.genders();
// Once random gender is used, don't do it again.
// Such as when restoring a saved character.
cfg_["random_gender"] = "no";
if(genders.empty() == false) {
return gen ? genders[get_random()%genders.size()] : genders.front();
} else {
@ -228,8 +231,8 @@ unit_race::GENDER unit::generate_gender(const unit_type& type, bool gen)
//! Initializes a unit from a unit type.
unit::unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map,
const gamestatus* game_status, const std::vector<team>* teams, const unit_type* t,
int side, bool use_traits, bool dummy_unit, unit_race::GENDER gender) :
gender_(dummy_unit ? gender : generate_gender(*t,use_traits)), resting_(false),
int side, bool use_traits, bool dummy_unit, unit_race::GENDER gender, std::string variation) :
variation_(variation), gender_(dummy_unit ? gender : generate_gender(*t,use_traits)), resting_(false),
state_(STATE_STANDING), facing_(gamemap::location::NORTH_EAST),draw_bars_(false),
gamedata_(gamedata),units_(unitmap),map_(map),gamestatus_(game_status),teams_(teams)
{
@ -269,8 +272,8 @@ unit::unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map,
unit_halo_ = halo::NO_HALO;
unit_anim_halo_ = halo::NO_HALO;
}
unit::unit(const unit_type* t, int side, bool use_traits, bool dummy_unit, unit_race::GENDER gender) :
gender_(dummy_unit ? gender : generate_gender(*t,use_traits)),
unit::unit(const unit_type* t, int side, bool use_traits, bool dummy_unit, unit_race::GENDER gender, std::string variation) :
variation_(variation),gender_(dummy_unit ? gender : generate_gender(*t,use_traits)),
state_(STATE_STANDING),facing_(gamemap::location::NORTH_EAST),draw_bars_(false),
gamedata_(NULL), units_(NULL),map_(NULL),gamestatus_(NULL),teams_(NULL)
{
@ -351,7 +354,7 @@ void unit::set_game_context(const game_data* gamedata, unit_map* unitmap, const
}
void unit::add_trait(std::string trait)
void unit::add_trait()
{
//modifications_.add_child("trait", cfg);
apply_modifications();
@ -517,6 +520,11 @@ void unit::advance_to(const unit_type* t, bool use_traits)
backup_state();
bool do_heal = false; // Track whether unit should get fully healed.
if(utils::string_bool(cfg_["random_gender"], false)) {
generate_gender(*t,true);
}
if(id()!=t->id() || cfg_["gender"] != cfg_["gender_id"]) {
do_heal = true; // Can't heal until after mods applied.
id_ = t->id();
@ -524,7 +532,6 @@ void unit::advance_to(const unit_type* t, bool use_traits)
cfg_["gender_id"] = cfg_["gender"];
}
if(utils::string_bool(cfg_["random_traits"], true)) {
generate_traits(!use_traits);
} else {
@ -1151,6 +1158,7 @@ void unit::read(const config& cfg, bool use_traits)
if(!(cfg["type"].empty() || cfg["type"] == cfg["id"]) || cfg["gender"] != cfg["gender_id"]) {
std::map<std::string,unit_type>::const_iterator i = gamedata_->unit_types.find(cfg["type"]);
if(i != gamedata_->unit_types.end()) {
advance_to(&i->second.get_gender_unit_type(gender_), use_traits);
type_set = true;
} else {
@ -1213,6 +1221,7 @@ void unit::read(const config& cfg, bool use_traits)
std::map<std::string,unit_type>::const_iterator uti = gamedata_->unit_types.find(cfg["type"]);
const unit_type* ut = NULL;
if(uti != gamedata_->unit_types.end()) {
ut = &uti->second.get_gender_unit_type(gender_).get_variation(variation_);
}

6
src/unit.hpp
View file

@ -61,8 +61,8 @@ public:
unit(const game_data& gamedata, const config& cfg, bool use_traits=false);
unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map, const gamestatus* game_status, const std::vector<team>* teams, const config& cfg, bool use_traits=false);
// Initilizes a unit from a unit type
unit(const unit_type* t, int side, bool use_traits=false, bool dummy_unit=false, unit_race::GENDER gender=unit_race::MALE);
unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map, const gamestatus* game_status, const std::vector<team>* teams, const unit_type* t, int side, bool use_traits=false, bool dummy_unit=false, unit_race::GENDER gender=unit_race::MALE);
unit(const unit_type* t, int side, bool use_traits=false, bool dummy_unit=false, unit_race::GENDER gender=unit_race::MALE, std::string variation="");
unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map, const gamestatus* game_status, const std::vector<team>* teams, const unit_type* t, int side, bool use_traits=false, bool dummy_unit=false, unit_race::GENDER gender=unit_race::MALE, std::string variation="");
virtual ~unit();
unit& operator=(const unit&);
@ -275,7 +275,7 @@ public:
void backup_state();
void apply_modifications();
void remove_temporary_modifications();
void add_trait(std::string trait);
void add_trait();
void generate_traits(bool musthaveonly=false);
void generate_traits_description();
std::string generate_description() const { return race_->generate_name(string_gender(cfg_["gender"])); }