[atlantik-cvs] CVS: kdegames/atlantik/libatlantic player.cpp,1.18,1.19 player.h,1.15,1.16
[email protected] Mon, 23 Jun 2003 01:44:23 +0200 (CEST)
Newsgroups
gmane.comp.kde.devel.atlantik
Message-ID
<[email protected] >
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv10552/libatlantic
Modified Files:
player.cpp player.h
Log Message:
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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- player.cpp 22 Jun 2003 02:43:26 -0000 1.18
+++ player.cpp 22 Jun 2003 23:44:21 -0000 1.19
@@ -28,7 +28,7 @@
m_location = m_destination = 0;
m_money = 0;
m_changed = m_isSelf = false;
- m_master = m_bankrupt = m_hasDebt = m_hasTurn = m_canRoll = m_canBuy = m_inJail = false;
+ m_master = m_bankrupt = m_hasDebt = m_hasTurn = m_canRoll = m_canBuy = m_canAuction = m_inJail = false;
}
void Player::setGame(int gameId)
@@ -108,6 +108,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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- player.h 22 Jun 2003 02:43:26 -0000 1.15
+++ player.h 22 Jun 2003 23:44:21 -0000 1.16
@@ -50,6 +50,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);
@@ -68,7 +70,7 @@
private:
int m_id, m_gameId;
bool m_changed, m_isSelf;
- bool m_master, m_bankrupt, m_hasDebt, m_hasTurn, m_canRoll, m_canBuy, m_inJail;
+ bool m_master, m_bankrupt, m_hasDebt, m_hasTurn, m_canRoll, m_canBuy, m_canAuction, m_inJail;
unsigned int m_money;
QString m_name, m_host, m_image;
Estate *m_location, *m_destination;