natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix details info window update check

Browse Source
This commit is contained in:
T1ti
2024-07-18 03:39:59 +02:00
parent 595f36311f
commit ebb9a9f1ca
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/noggit/MapView.cpp
View File

@@ -1063,10 +1063,6 @@ void MapView::updateDetailInfos()
{ {
if (!current_selection.empty()) if (!current_selection.empty())
{ {
std::uintptr_t previous_sel_last = 0;
if (!lastSelected.empty())
previous_sel_last = reinterpret_cast<std::uintptr_t>(&const_cast<selection_type&>(lastSelected.back()));
selection_type& selection_last = const_cast<selection_type&>(current_selection.back()); selection_type& selection_last = const_cast<selection_type&>(current_selection.back());
switch (selection_last.index()) switch (selection_last.index())
@@ -1074,21 +1070,13 @@ void MapView::updateDetailInfos()
case eEntry_Object: case eEntry_Object:
{ {
auto obj = std::get<selected_object_type>(selection_last); auto obj = std::get<selected_object_type>(selection_last);
obj->updateDetails(guidetailInfos);
if (reinterpret_cast<std::uintptr_t>(obj) != previous_sel_last || NOGGIT_CUR_ACTION)
{
obj->updateDetails(guidetailInfos);
}
break; break;
} }
case eEntry_MapChunk: case eEntry_MapChunk:
{ {
selected_chunk_type& chunk_sel(std::get<selected_chunk_type>(selection_last)); selected_chunk_type& chunk_sel(std::get<selected_chunk_type>(selection_last));
chunk_sel.updateDetails(guidetailInfos);
if (reinterpret_cast<std::uintptr_t>(chunk_sel.chunk) != previous_sel_last || NOGGIT_CUR_ACTION)
{
chunk_sel.updateDetails(guidetailInfos);
}
break; break;
} }
} }
@@ -4549,7 +4537,8 @@ void MapView::tick (float dt)
} }
} }
updateDetailInfos(); // checks if sel changed if (selection_changed || NOGGIT_CUR_ACTION)
updateDetailInfos(); // checks if sel changed
if (selection_changed) if (selection_changed)
{ {