[atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.126,1.127
[email protected] Thu, 19 Dec 2002 01:37:37 +0100 (CET)
Newsgroups
gmane.comp.kde.devel.atlantik
Message-ID
<[email protected] >
Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv24623/client
Modified Files:
atlantik.cpp
Log Message:
never reinit existing board
Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- atlantik.cpp 14 Dec 2002 01:04:02 -0000 1.126
+++ atlantik.cpp 19 Dec 2002 00:37:33 -0000 1.127
@@ -166,9 +166,7 @@
void Atlantik::newPlayer(Player *player)
{
- if (!m_board)
- initBoard();
-
+ initBoard();
m_board->addToken(player);
PortfolioView *portfolioView = new PortfolioView(m_atlanticCore, player, m_config.activeColor, m_config.inactiveColor, m_portfolioWidget);
@@ -190,9 +188,7 @@
void Atlantik::newEstate(Estate *estate)
{
- if (!m_board)
- initBoard();
-
+ initBoard();
m_board->addEstateView(estate, m_config.indicateUnowned, m_config.highliteUnowned, m_config.darkenMortgaged, m_config.quartzEffects);
}
@@ -205,9 +201,7 @@
void Atlantik::newAuction(Auction *auction)
{
- if (!m_board)
- initBoard();
-
+ initBoard();
m_board->addAuctionWidget(auction);
}
@@ -304,6 +298,9 @@
void Atlantik::initBoard()
{
+ if (m_board)
+ return;
+
m_board = new AtlantikBoard(m_atlanticCore, 40, AtlantikBoard::Play, m_mainWidget, "board");
m_board->setViewProperties(m_config.indicateUnowned, m_config.highliteUnowned, m_config.darkenMortgaged, m_config.quartzEffects, m_config.animateTokens);