[atlantik-cvs] CVS: kdegames/atlantik/libatlantic estate.cpp,1.7,1.8 estate.h,1.10,1.11 player.cpp,1.10,1.11

Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv16570/libatlantic

Modified Files:
	estate.cpp estate.h player.cpp 
Log Message:
remove display msgs from text

Index: estate.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estate.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- estate.cpp	2002/11/27 21:08:56	1.7
+++ estate.cpp	2002/11/28 11:59:24	1.8
@@ -23,9 +23,11 @@
 Estate::Estate(int estateId) : QObject()
 {
 	m_id = estateId;
+	m_name = QString::null;
 	m_owner = 0;
 	m_houses = 0;
 	m_price = 0;
+	m_estateGroup = 0;
 	m_changed = m_canBeOwned = m_canBuyHouses = m_canSellHouses = m_isMortgaged = m_canToggleMortgage = false;
 	m_bgColor = QColor();
 	m_color = QColor();
@@ -68,13 +70,18 @@
 		m_changed = true;
 }
 
-void Estate::setName(const QString name)
+void Estate::setName(QString name)
 {
 	if (m_name != name)
 	{
 		m_name = name;
 		m_changed = true;
 	}
+}
+
+QString Estate::name()
+{
+	return m_name;
 }
 
 void Estate::setColor(QColor color)

Index: estate.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estate.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- estate.h	2002/11/27 21:08:56	1.10
+++ estate.h	2002/11/28 11:59:24	1.11
@@ -29,9 +29,9 @@
 
 public:
 	Estate(int estateId);
-	int id() const { return m_id; }
-	void setName(const QString name);
-	QString name() const { return m_name; }
+	int id() { return m_id; }
+	void setName(QString name);
+	QString name();
 	void setEstateGroup(EstateGroup *estateGroup);
 	EstateGroup *estateGroup() { return m_estateGroup; }
 	void setOwner(Player *player);

Index: player.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/player.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- player.cpp	2002/11/27 21:08:56	1.10
+++ player.cpp	2002/11/28 11:59:24	1.11
@@ -22,6 +22,7 @@
 {
 	m_id = playerId;
 	m_location = 0;
+	m_money = 0;
 	m_changed = m_isSelf = false;
 	m_hasTurn = m_canRoll = m_canBuy = m_inJail = false;
 }
@@ -80,11 +81,11 @@
 	}
 }
 
-void Player::setMoney(unsigned int _m)
+void Player::setMoney(unsigned int money)
 {
-	if (m_money != _m)
+	if (m_money != money)
 	{
-		m_money = _m;
+		m_money = money;
 		m_changed = true;
 	}
 }