From ce0d465d156c1efe1fc8112725e4e5574adb8834 Mon Sep 17 00:00:00 2001 From: Oleg Derevenetz Date: Mon, 14 Oct 2024 15:56:15 +0300 Subject: [PATCH] Make the ItemsBar::GetCurItemIter() non-virtual --- src/fheroes2/gui/interface_itemsbar.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/fheroes2/gui/interface_itemsbar.h b/src/fheroes2/gui/interface_itemsbar.h index 16170bb76e..4f0f2ed508 100644 --- a/src/fheroes2/gui/interface_itemsbar.h +++ b/src/fheroes2/gui/interface_itemsbar.h @@ -194,11 +194,6 @@ namespace Interface return items.end(); } - virtual ItemsIterator GetCurItemIter() - { - return items.end(); - } - virtual void RedrawItemIter( ItemsIterator it, const fheroes2::Rect & pos, fheroes2::Image & output ) { RedrawItem( **it, pos, output ); @@ -453,7 +448,7 @@ namespace Interface using ItemsIterator = typename ItemsBar::ItemsIterator; using ItemIterPos = typename ItemsBar::ItemIterPos; - ItemsIterator GetCurItemIter() final + ItemsIterator GetCurItemIter() { return curItemPos.first; }