From 470885d7191a52b3ba018a9277c84e7c20c9c6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= Date: Sat, 26 May 2012 10:02:55 +0000 Subject: [PATCH] Fixed #969. Minor changes. --- .../BattleInterface/CBattleInterfaceClasses.cpp | 15 ++------------- client/BattleInterface/CBattleInterfaceClasses.h | 1 - 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/client/BattleInterface/CBattleInterfaceClasses.cpp b/client/BattleInterface/CBattleInterfaceClasses.cpp index 38b612d1a..2cac584f5 100644 --- a/client/BattleInterface/CBattleInterfaceClasses.cpp +++ b/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() diff --git a/client/BattleInterface/CBattleInterfaceClasses.h b/client/BattleInterface/CBattleInterfaceClasses.h index 537a77831..539d35a22 100644 --- a/client/BattleInterface/CBattleInterfaceClasses.h +++ b/client/BattleInterface/CBattleInterfaceClasses.h @@ -97,7 +97,6 @@ public: void bExitf(); //exit button callback void activate(); - void deactivate(); void show(SDL_Surface * to = 0); };