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

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/libatlantic atlantic_core.cpp,1.13,1.14 atlantic_core.h,1.12,1
From:       kde () office ! kde ! org
Date:       2002-10-23 15:56:43
[Download RAW message or body]

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

Modified Files:
	atlantic_core.cpp atlantic_core.h estategroup.cpp 
	estategroup.h 
Log Message:
monopd 0.6.0 API fixes, okayed by Will Andrews (#kde-freebsd)

Index: atlantic_core.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- atlantic_core.cpp	2002/07/29 19:09:49	1.13
+++ atlantic_core.cpp	2002/10/23 15:56:41	1.14
@@ -56,9 +56,9 @@
 	return m_estateGroups;
 }
 
-EstateGroup *AtlanticCore::newEstateGroup(QString name)
+EstateGroup *AtlanticCore::newEstateGroup(const int id)
 {
-	EstateGroup *estateGroup = new EstateGroup(name);
+	EstateGroup *estateGroup = new EstateGroup(id);
 	m_estateGroups.append(estateGroup);
 	return estateGroup;
 }
@@ -103,18 +103,4 @@
 {
 	m_auctions.remove(auction);
 	delete auction;
-}
-
-void AtlanticCore::setCurrentTurn(Player *player)
-{
-	Player *p;
-	for (QPtrListIterator<Player> i(m_players); *i; ++i)
-	{
-		p = dynamic_cast<Player *>(*i);
-		if (p)
-		{
-			p->setHasTurn(p==player);
-			p->update();
-		}
-	}
 }

Index: atlantic_core.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- atlantic_core.h	2002/07/29 19:09:49	1.12
+++ atlantic_core.h	2002/10/23 15:56:41	1.13
@@ -40,7 +40,7 @@
 	Estate *newEstate(int estateId);
 
 	QPtrList<EstateGroup> estateGroups();
-	EstateGroup *newEstateGroup(QString name);
+	EstateGroup *newEstateGroup(const int id);
 
 	QPtrList<Trade> trades();
 	Trade *newTrade(int tradeId);
@@ -49,8 +49,6 @@
 	QPtrList<Auction> auctions();
 	Auction *newAuction(int auctionId, Estate *estate);
 	void delAuction(Auction *auction);
-
-	void setCurrentTurn(Player *player);
 
 signals:
 	void removeGUI(Trade *trade);

Index: estategroup.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estategroup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- estategroup.cpp	2002/04/23 17:02:55	1.3
+++ estategroup.cpp	2002/10/23 15:56:41	1.4
@@ -17,9 +17,9 @@
 #include "estategroup.h"
 #include "estategroup.moc"
 
-EstateGroup::EstateGroup(const QString name) : QObject()
+EstateGroup::EstateGroup(const int id) : QObject()
 {
-	m_name = name;
+	m_id = id;
 }
 
 void EstateGroup::setName(const QString name)

Index: estategroup.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estategroup.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- estategroup.h	2002/04/23 17:02:55	1.3
+++ estategroup.h	2002/10/23 15:56:41	1.4
@@ -24,7 +24,7 @@
 Q_OBJECT
 
 public:
-	EstateGroup(const QString name);
+	EstateGroup(const int id);
 	void setName(const QString name);
 	QString name() const { return m_name; }
 	void update(bool force = false);
@@ -33,6 +33,7 @@
 	void changed();
 
 private:
+	int m_id;
 	bool m_changed;
 	QString m_name;
 };

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs
[prev in list] [next in list] [prev in thread] [next in thread]