[atlantik-cvs] CVS: kdegames/atlantik/libatlantic player.cpp,1.9.8.7,1.9.8.8 player.h,1.7.8.6,1.7.8.7

[email protected]
Newsgroups gmane.comp.kde.devel.atlantik
Message-ID <[email protected]>
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv10648/libatlantic

Modified Files:
      Tag: KDE_3_1_BRANCH
	player.cpp player.h 
Log Message:
backport: bugfix for bug 54516 (auctions enabled in menu when they should not be)

Index: player.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/player.cpp,v
retrieving revision 1.9.8.7
retrieving revision 1.9.8.8
diff -u -d -r1.9.8.7 -r1.9.8.8
--- player.cpp	22 Jun 2003 02:51:08 -0000	1.9.8.7
+++ player.cpp	22 Jun 2003 23:45:10 -0000	1.9.8.8
@@ -27,7 +27,7 @@
 	m_name = "";
 	m_host = "";
 	m_changed = m_isSelf = false;
-	m_bankrupt = m_hasDebt = m_hasTurn = m_canRoll = m_canBuy = m_inJail = false;
+	m_bankrupt = m_hasDebt = m_hasTurn = m_canRoll = m_canBuy = m_canAuction = m_inJail = false;
 }
 
 void Player::setGame(int gameId)
@@ -98,6 +98,15 @@
 	if (m_canBuy != canBuy)
 	{
 		m_canBuy = canBuy;
+		m_changed = true;
+	}
+}
+
+void Player::setCanAuction(bool canAuction)
+{
+	if (m_canAuction != canAuction)
+	{
+		m_canAuction = canAuction;
 		m_changed = true;
 	}
 }

Index: player.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/player.h,v
retrieving revision 1.7.8.6
retrieving revision 1.7.8.7
diff -u -d -r1.7.8.6 -r1.7.8.7
--- player.h	22 Jun 2003 02:51:08 -0000	1.7.8.6
+++ player.h	22 Jun 2003 23:45:10 -0000	1.7.8.7
@@ -48,6 +48,8 @@
 	bool canRoll() const { return m_canRoll; }
 	void setCanBuy(bool canBuy);
 	bool canBuy() const { return m_canBuy; }
+	void setCanAuction(bool canAuction);
+	bool canAuction() const { return m_canAuction; }
 	void setInJail(const bool inJail);
 	bool inJail() const { return m_inJail; }
 	void setName(const QString _n);
@@ -64,7 +66,7 @@
 private:
 	int m_id, m_gameId;
 	bool m_changed, m_isSelf;
-	bool m_bankrupt, m_hasDebt, m_hasTurn, m_canRoll, m_canBuy, m_inJail;
+	bool m_bankrupt, m_hasDebt, m_hasTurn, m_canRoll, m_canBuy, m_canAuction, m_inJail;
 	unsigned int m_money;
 	QString m_name, m_host;
 	Estate *m_location, *m_destination;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.