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

Fixed transparency broken by previous...

Browse source 
...fix of static de-initialization of t_tokens
This commit is contained in:
Thonsew 2011-09-22 11:31:34 +00:00
parent eb5852f5f5
commit e5b7d38777
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/scenario-test.cfg
View file

@ -410,7 +410,7 @@ local result = wesnoth.synchronize_choice(function()
local function select()
local i = wesnoth.get_dialog_value "the_list"
local ut = wesnoth.unit_types[types[i]].__cfg
local profile = string.gsub(ut.profile, "([^/]+)$", "/%1")
local profile = string.gsub(ut.profile, "([^/]+)$", "transparent/%1")
if wesnoth.get_dialog_value "flip" then profile = profile .. "~FL()" end
wesnoth.set_dialog_value(profile, "the_image")
end

17
src/unit_types.cpp
View file

@ -821,7 +821,6 @@ void unit_type::build_full(const movement_type_map &mv_types,
void unit_type::build_help_index(const movement_type_map &mv_types,
const race_map &races, const config::const_child_itors &traits)
{
static const config::t_token & z_empty( generate_safe_static_const_t_interned(n_token::t_token("")) );
static const config::t_token & z_name( generate_safe_static_const_t_interned(n_token::t_token("name")) );
static const config::t_token & z_description( generate_safe_static_const_t_interned(n_token::t_token("description")) );
static const config::t_token & z_hitpoints( generate_safe_static_const_t_interned(n_token::t_token("hitpoints")) );
@ -861,9 +860,9 @@ void unit_type::build_help_index(const movement_type_map &mv_types,
image_ = cfg_[z_image].token();
small_profile_ = cfg_[z_small_profile].token();
big_profile_ = cfg_[z_profile].token();
std::pair<config::t_token, config::t_token> new_profiles = adjust_profile(small_profile_, big_profile_, z_empty);
cfg_[z_small_profile] = new_profiles.first;
cfg_[z_profile] = new_profiles.second;
std::pair<config::t_token, config::t_token> new_profiles = adjust_profile(small_profile_, big_profile_, image_);
small_profile_ = new_profiles.first;
big_profile_ = new_profiles.second;
for (int i = 0; i < 2; ++i) {
@ -1544,12 +1543,12 @@ unit_type_data unit_types;
std::pair<config::t_token, config::t_token> adjust_profile(config::t_token const &ismall, config::t_token const &ibig, config::t_token const &def) {
config::t_token big(ibig), small(ismall);
if (ibig.empty() || ibig == n_token::t_token::z_empty()) {
if (ibig.empty() ){//|| ibig == n_token::t_token::z_empty()) {
// No profile data; use the default image.
small = def;
big = def;
}
else if (ismall.empty() || ismall == n_token::t_token::z_empty()) {
else if (ismall.empty() ){//|| ismall == n_token::t_token::z_empty()) {
// No small profile; use the current profile for it and
// try to infer the big one.
small = ibig;
@ -1561,11 +1560,9 @@ std::pair<config::t_token, config::t_token> adjust_profile(config::t_token const
} else {
sbig = "transparent/" + sbig;
}
if (!image::locator(sbig).file_exists()){
big = config::t_token(sbig);
if (!image::locator(big).file_exists()){
big = small; }
else {
big = config::t_token(sbig);
}
}
return std::make_pair(small, big);
}