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

default to true for generate_name

Browse source 
made it so we don't generate names if there already is one

put the name generation logic inside generate_name() so it's used
uniformly everywhere
This commit is contained in:
Gunter Labes 2009-10-24 16:09:16 +00:00
parent 056b6606b2
commit 1534058519
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/unit.cpp
View file

@ -490,6 +490,14 @@ void unit::set_game_context(unit_map *unitmap)
game_events::add_events(cfg_.child_range("event"), type_);
}
void unit::generate_name(rand_rng::simple_rng* rng)
{
if (!name_.empty() || !utils::string_bool(cfg_["generate_name"], true)) return;
name_ = race_->generate_name(gender_, rng);
cfg_["generate_name"] = "no";
}
// Apply mandatory traits (e.g. undead, mechanical) to a unit and then
// fill out with avaiable (leaders have a restircted set of available traits)
// traits until no more are available or the unit has its maximum number
@ -1521,10 +1529,8 @@ void unit::read(const config& cfg, bool use_traits, game_state* state)
} else if(cfg["type"]=="") {
alignment_ = unit_type::NEUTRAL;
}
if(utils::string_bool(cfg["generate_name"])) {
generate_name(state ? &(state->rng()) : 0);
cfg_["generate_name"] = "";
}
generate_name(state ? &(state->rng()) : 0);
game_events::add_events(cfg_.child_range("event"), type_);
// Make the default upkeep "full"

3
src/unit.hpp
View file

@ -316,8 +316,7 @@ public:
void remove_temporary_modifications();
void generate_traits(bool musthaveonly=false, game_state* state = 0);
void generate_traits_description();
void generate_name(rand_rng::simple_rng *rng = 0)
{ name_ = race_->generate_name(gender_, rng); }
void generate_name(rand_rng::simple_rng *rng = 0);
// Only see_all=true use caching
bool invisible(const map_location& loc,