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

Simplify is_in_hex

Browse source 
Avoids double cache lookup.
This commit is contained in:
Charles Dang 2024-02-24 19:42:48 -05:00
parent d3739effcf
commit 2227eb00dd
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/picture.cpp
View file

@ -827,25 +827,13 @@ point get_size(const locator& i_locator, bool skip_cache)
bool is_in_hex(const locator& i_locator)
{
bool result;
{
if(i_locator.in_cache(in_hex_info_)) {
result = i_locator.locate_in_cache(in_hex_info_);
} else {
const surface image(get_surface(i_locator, UNSCALED));
bool res = in_mask_surface(image, get_hexmask());
i_locator.add_to_cache(in_hex_info_, res);
// std::cout << "in_hex : " << i_locator.get_filename()
// << " " << (res ? "yes" : "no") << "\n";
result = res;
}
if(auto cached_val = i_locator.copy_from_cache(in_hex_info_)) {
return *cached_val;
}
return result;
bool res = in_mask_surface(get_surface(i_locator, UNSCALED), get_hexmask());
i_locator.add_to_cache(in_hex_info_, res);
return res;
}
bool is_empty_hex(const locator& i_locator)