diff --git a/client/windows/CHeroWindow.cpp b/client/windows/CHeroWindow.cpp index e5ebb79d2..82f0627aa 100644 --- a/client/windows/CHeroWindow.cpp +++ b/client/windows/CHeroWindow.cpp @@ -100,7 +100,7 @@ CHeroSwitcher::CHeroSwitcher(CHeroWindow * owner_, Point pos_, const CGHeroInsta } CHeroWindow::CHeroWindow(const CGHeroInstance * hero) - : CWindowObject(PLAYER_COLORED, "HeroScr4"), + : CStatusbarWindow(PLAYER_COLORED, "HeroScr4"), heroWArt(this, hero) { auto & heroscrn = CGI->generaltexth->heroscrn; @@ -112,7 +112,7 @@ CHeroWindow::CHeroWindow(const CGHeroInstance * hero) name = std::make_shared(190, 38, EFonts::FONT_BIG, EAlignment::CENTER, Colors::YELLOW); title = std::make_shared(190, 65, EFonts::FONT_MEDIUM, EAlignment::CENTER, Colors::WHITE); - statusBar = CGStatusBar::create(7, 559, "ADROLLVR.bmp", 660); + statusbar = CGStatusBar::create(7, 559, "ADROLLVR.bmp", 660); quitButton = std::make_shared(Point(609, 516), "hsbtns.def", CButton::tooltip(heroscrn[17]), [=](){ close(); }, SDLK_RETURN); quitButton->assignedKeys.insert(SDLK_ESCAPE); diff --git a/client/windows/CHeroWindow.h b/client/windows/CHeroWindow.h index 685741b23..8c92eb907 100644 --- a/client/windows/CHeroWindow.h +++ b/client/windows/CHeroWindow.h @@ -57,13 +57,12 @@ public: int64_t getTreeVersion() const override; }; -class CHeroWindow : public CWindowObject, public CGarrisonHolder, public CWindowWithArtifacts +class CHeroWindow : public CStatusbarWindow, public CGarrisonHolder, public CWindowWithArtifacts { std::shared_ptr name; std::shared_ptr title; std::shared_ptr banner; - std::shared_ptr statusBar; std::vector> heroList; std::shared_ptr listSelection;