瀏覽代碼

Revert old statusbar hackfix

Dydzio 6 年之前
父節點
當前提交
fd9f16142d
共有 2 個文件被更改,包括 0 次插入10 次删除
  1. 0 6
      client/widgets/TextControls.cpp
  2. 0 4
      client/widgets/TextControls.h

+ 0 - 6
client/widgets/TextControls.cpp

@@ -376,11 +376,6 @@ CGStatusBar::CGStatusBar(int x, int y, std::string name, int maxw)
 	autoRedraw = false;
 }
 
-CGStatusBar::~CGStatusBar()
-{
-	GH.statusbar = oldStatusBar;
-}
-
 void CGStatusBar::show(SDL_Surface * to)
 {
 	showAll(to);
@@ -388,7 +383,6 @@ void CGStatusBar::show(SDL_Surface * to)
 
 void CGStatusBar::init()
 {
-	oldStatusBar = GH.statusbar;
 	GH.statusbar = shared_from_this();
 }
 

+ 0 - 4
client/widgets/TextControls.h

@@ -119,8 +119,6 @@ class CGStatusBar : public CLabel, public std::enable_shared_from_this<CGStatusB
 	bool textLock; //Used for blocking changes to the text
 	void init();
 
-	std::shared_ptr<CGStatusBar> oldStatusBar;
-
 	CGStatusBar(std::shared_ptr<CPicture> background_, EFonts Font = FONT_SMALL, EAlignment Align = CENTER, const SDL_Color & Color = Colors::WHITE);
 	CGStatusBar(int x, int y, std::string name, int maxw = -1);
 protected:
@@ -139,8 +137,6 @@ public:
 
 	void show(SDL_Surface * to) override; //shows statusbar (with current text)
 
-	~CGStatusBar();
-
 	void lock(bool shouldLock); //If true, current text cannot be changed until lock(false) is called
 };