games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2"

Browse Source 
This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.
This commit is contained in:
nordsoft 2023-08-14 16:33:41 +04:00
parent e426924930
commit 0c76ae89f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/gui/CIntObject.h
View File

@ -142,7 +142,7 @@ class WindowBase : public CIntObject
public: public:
WindowBase(int used_ = 0, Point pos_ = Point()); WindowBase(int used_ = 0, Point pos_ = Point());
protected: protected:
virtual void close(); void close();
}; };
class IGarrisonHolder class IGarrisonHolder

4
client/windows/InfoWindows.h
View File

@ -55,7 +55,7 @@ public:
std::vector<std::shared_ptr<CButton>> buttons; std::vector<std::shared_ptr<CButton>> buttons;
TCompsInfo components; TCompsInfo components;
void close() override; virtual void close();
void show(Canvas & to) override; void show(Canvas & to) override;
void showAll(Canvas & to) override; void showAll(Canvas & to) override;
@ -78,7 +78,7 @@ public:
class CRClickPopup : public WindowBase class CRClickPopup : public WindowBase
{ {
public: public:
void close() override; virtual void close();
bool isPopupWindow() const override; bool isPopupWindow() const override;
static std::shared_ptr<WindowBase> createInfoWin(Point position, const CGObjectInstance * specific); static std::shared_ptr<WindowBase> createInfoWin(Point position, const CGObjectInstance * specific);