瀏覽代碼

Fixed #969.
Minor changes.

Michał W. Urbańczyk 13 年之前
父節點
當前提交
470885d719
共有 2 個文件被更改,包括 2 次插入14 次删除
  1. 2 13
      client/BattleInterface/CBattleInterfaceClasses.cpp
  2. 0 1
      client/BattleInterface/CBattleInterfaceClasses.h

+ 2 - 13
client/BattleInterface/CBattleInterfaceClasses.cpp

@@ -475,24 +475,13 @@ CBattleResultWindow::~CBattleResultWindow()
 void CBattleResultWindow::activate()
 {
 	owner->curInt->showingDialog->set(true);
-	exit->activate();
-}
-
-void CBattleResultWindow::deactivate()
-{
-	exit->deactivate();
+	CIntObject::activate();
 }
 
 void CBattleResultWindow::show(SDL_Surface * to)
 {
 	CIntObject::show(to);
-	//evaluating to
-	if(!to)
-		to = screen;
-
-	CCS->videoh->update(pos.x + 107, pos.y + 70, screen, false, true);
-
-	exit->showAll(to);
+	CCS->videoh->update(pos.x + 107, pos.y + 70, screen, true, false);
 }
 
 void CBattleResultWindow::bExitf()

+ 0 - 1
client/BattleInterface/CBattleInterfaceClasses.h

@@ -97,7 +97,6 @@ public:
 	void bExitf(); //exit button callback
 
 	void activate();
-	void deactivate();
 	void show(SDL_Surface * to = 0);
 };