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

Use explicit casts to accommodate changes to boost's tribool in 1.69.

Browse source 
(fixes #3646)
This commit is contained in:
Wedge009 2018-12-27 08:15:10 +11:00
parent a44617c408
commit f6a32792d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/units/frame.cpp
View file

@ -460,15 +460,15 @@ std::vector<std::string> frame_parsed_parameters::debug_strings() const
}
if(!boost::indeterminate(auto_vflip_)) {
v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_));
v.emplace_back("auto_vflip=" + utils::bool_string(static_cast<bool>(auto_vflip_)));
}
if(!boost::indeterminate(auto_hflip_)) {
v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_));
v.emplace_back("auto_hflip=" + utils::bool_string(static_cast<bool>(auto_hflip_)));
}
if(!boost::indeterminate(primary_frame_)) {
v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_));
v.emplace_back("primary_frame=" + utils::bool_string(static_cast<bool>(primary_frame_)));
}
if(!drawing_layer_.get_original().empty()) {
@ -768,7 +768,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time, const fram
}
// Convert the tribool to bool
const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame);
const bool primary = static_cast<bool>(result.primary_frame) || boost::logic::indeterminate(result.primary_frame);
/** The engine provides a default image to use for the unit when none is available */
result.image = current_val.image.is_void() || current_val.image.get_filename().empty()