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

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/libatlantikui
From:       kde () office ! kde ! org
Date:       2003-11-17 2:50:45
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv10286/libatlantikui

Modified Files:
      Tag: atlantik_3_3_branch
	auction_widget.cpp board.cpp portfolioview.cpp 
	trade_widget.cpp 
Log Message:
more gameupdate changes, game master is now a server-wide property

Index: auction_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/auction_widget.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- auction_widget.cpp	5 Nov 2003 19:37:20 -0000	1.13
+++ auction_widget.cpp	17 Nov 2003 02:50:42 -0000	1.13.2.1
@@ -61,7 +61,7 @@
 	QPtrList<Player> playerList = m_atlanticCore->players();
 	for (QPtrListIterator<Player> it(playerList); *it; ++it)
 	{
-		if ((player = *it) && player->gameId() == pSelf->gameId())
+		if ( (player = *it) && player->game() == pSelf->game() )
 		{
 			item = new KListViewItem(m_playerList, player->name(), QString("0"));
 			item->setPixmap(0, QPixmap(SmallIcon("personal")));

Index: board.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v
retrieving revision 1.119
retrieving revision 1.119.2.1
diff -u -d -r1.119 -r1.119.2.1
--- board.cpp	5 Nov 2003 23:40:26 -0000	1.119
+++ board.cpp	17 Nov 2003 02:50:42 -0000	1.119.2.1
@@ -205,7 +205,7 @@
 	if (m_atlanticCore)
 		playerSelf = m_atlanticCore->playerSelf();
 
-	if (playerSelf && playerSelf->gameId() != player->gameId() )
+	if (playerSelf && playerSelf->game() != player->game() )
 	{
 		kdDebug() << "addToken ignored - not in same game as playerSelf" << endl;
 		return;
@@ -236,7 +236,7 @@
 	if (token)
 	{
 		kdDebug() << "playerChanged: tokenLoc " << (token->location() ? \
                token->location()->name() : "none") << endl;
-		if (player->isBankrupt() || (playerSelf && playerSelf->gameId() != \
player->gameId()) ) +		if (player->isBankrupt() || (playerSelf && playerSelf->game() \
!= player->game()) )  token->hide();
 		if (player->hasTurn())
 			token->raise();

Index: portfolioview.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/portfolioview.cpp,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -d -r1.56.2.1 -r1.56.2.2
--- portfolioview.cpp	15 Nov 2003 13:36:03 -0000	1.56.2.1
+++ portfolioview.cpp	17 Nov 2003 02:50:42 -0000	1.56.2.2
@@ -252,8 +252,7 @@
 		{
 			// Kick player
 			rmbMenu->insertItem(i18n("Boot player %1 to lounge").arg(m_player->name()), 0);
-			if ( !playerSelf->master() )
-				rmbMenu->setItemEnabled(0, false);
+			rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() );
 		}
 
 		connect(rmbMenu, SIGNAL(activated(int)), this, SLOT(slotMenuAction(int)));

Index: trade_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/trade_widget.cpp,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -d -r1.41 -r1.41.2.1
--- trade_widget.cpp	5 Nov 2003 19:37:20 -0000	1.41
+++ trade_widget.cpp	17 Nov 2003 02:50:42 -0000	1.41.2.1
@@ -95,7 +95,7 @@
 
 	for (QPtrListIterator<Player> it(playerList); *it; ++it)
 	{
-		if ((player = *it) && player->gameId() == pSelf->gameId())
+		if ((player = *it) && player->game() == pSelf->game())
 		{
 			m_playerFromCombo->insertItem(player->name());
 			m_playerFromMap[m_playerFromCombo->count() - 1] = player;

_______________________________________________
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]