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

Avoid dereference of iterator end.

Browse source
This commit is contained in:
Wedge009 2016-10-07 19:59:14 +11:00
parent fa2340413f
commit 807f8d2144
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/minimap.cpp
View file

@ -162,16 +162,19 @@ surface getMinimap(int w, int h, const gamemap &map, const team *vw, const std::
i = normal_cache->insert(cache_map::value_type(terrain,surf)).first;
}
surf = i->second;
if (i != cache->end())
{
surf = i->second;
if (need_fogging) {
surf = adjust_surface_color(surf,-50,-50,-50);
fog_cache->insert(cache_map::value_type(terrain,surf));
}
if (need_fogging) {
surf = adjust_surface_color(surf, -50, -50, -50);
fog_cache->insert(cache_map::value_type(terrain, surf));
}
if (need_highlighting) {
surf = adjust_surface_color(surf,50,50,50);
highlight_cache->insert(cache_map::value_type(terrain,surf));
if (need_highlighting) {
surf = adjust_surface_color(surf, 50, 50, 50);
highlight_cache->insert(cache_map::value_type(terrain, surf));
}
}
if(surf != nullptr)