[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp, 1.170,
From:       kde () office ! kde ! org
Date:       2004-09-06 19:11:38
Message-ID: 413CB66A.mail43R11DI6T () office ! kde ! org
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv5266/client

Modified Files:
      Tag: KDE_3_3_BRANCH
	atlantik.cpp atlantik.h main.h 
Log Message:
Fix bug #88617: "When a game has been won, and the application is closed, the
"forfeit game" dialog still appears"

Bumped version number.


Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.170
retrieving revision 1.170.2.1
diff -u -d -r1.170 -r1.170.2.1
--- atlantik.cpp	7 Jul 2004 16:23:01 -0000	1.170
+++ atlantik.cpp	6 Sep 2004 19:11:33 -0000	1.170.2.1
@@ -94,7 +94,9 @@
 	return rmbMenu;
 }
 
-Atlantik::Atlantik () : KMainWindow ()
+Atlantik::Atlantik ()
+ :	KMainWindow (),
+ 	m_runningGame( false )
 {
 	// Read application configuration
 	readConfig();
@@ -408,6 +410,8 @@
 	if (!m_board)
 		initBoard();
 
+	m_runningGame = true;
+
 	m_mainLayout->addMultiCellWidget(m_board, 0, 2, 1, 1);
 	m_board->displayDefault();
 	m_board->show();
@@ -423,6 +427,7 @@
 	if (!m_board)
 		showBoard();
 
+	m_runningGame = false;
 	// TODO: m_board->freeze();
 }
 
@@ -814,7 +819,7 @@
 	Player *playerSelf = m_atlanticCore->playerSelf();
 
 	int result = KMessageBox::Yes;
-	if ( gameSelf && !playerSelf->isBankrupt() )
+	if ( gameSelf && !playerSelf->isBankrupt() && m_runningGame )
 		result = KMessageBox::warningYesNo( this, i18n("You are currently part of an \
active game. Are you sure you want to close Atlantik? If you do, you forfeit the \
game."), i18n("Close & Forfeit?") );  
 	if ( result == KMessageBox::Yes )

Index: atlantik.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.h,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -d -r1.68 -r1.68.2.1
--- atlantik.h	27 Jun 2004 16:04:43 -0000	1.68
+++ atlantik.h	6 Sep 2004 19:11:33 -0000	1.68.2.1
@@ -258,6 +258,8 @@
 
 	QPtrList<PortfolioView> m_portfolioViews;
 	QMap<Trade *, TradeDisplay *> m_tradeGUIMap;
+
+	bool m_runningGame;
 };
 
 #endif

Index: main.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/main.h,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -d -r1.51 -r1.51.2.1
--- main.h	5 Aug 2004 08:26:08 -0000	1.51
+++ main.h	6 Sep 2004 19:11:33 -0000	1.51.2.1
@@ -17,12 +17,12 @@
 #ifndef ATLANTIK_MAIN_H
 #define ATLANTIK_MAIN_H
 
-#define	ATLANTIK_VERSION 070
-#define	ATLANTIK_VERSION_STRING "0.7.0"
+#define	ATLANTIK_VERSION 071
+#define	ATLANTIK_VERSION_STRING "0.7.1"
 
 #define ATLANTIK_VERSION_MAJOR 0
 #define ATLANTIK_VERSION_MINOR 7
-#define ATLANTIK_VERSION_RELEASE 0
+#define ATLANTIK_VERSION_RELEASE 1
 
 int main(int, char *[]);
 

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@kde.org
https://mail.kde.org/mailman/listinfo/atlantik-cvs


[prev in list] [next in list] [prev in thread] [next in thread]