[atlantik-cvs] CVS: kdegames/atlantik/libatlantic trade.cpp,1.17.6.1,1.17.6.2 trade.h,1.11,1.11.8.1
[email protected] Mon, 23 Jun 2003 03:46:39 +0200 (CEST)
Newsgroups
gmane.comp.kde.devel.atlantik
Message-ID
<[email protected] >
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv12153/libatlantic
Modified Files:
Tag: KDE_3_1_BRANCH
trade.cpp trade.h
Log Message:
backport: anotha' trade patch
Index: trade.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/trade.cpp,v
retrieving revision 1.17.6.1
retrieving revision 1.17.6.2
diff -u -d -r1.17.6.1 -r1.17.6.2
--- trade.cpp 23 Dec 2002 02:03:57 -0000 1.17.6.1
+++ trade.cpp 23 Jun 2003 01:46:36 -0000 1.17.6.2
@@ -22,8 +22,7 @@
Trade::Trade(int tradeId)
{
m_tradeId = tradeId;
-
- m_changed = false;
+ m_changed = m_rejected = false;
}
void Trade::addPlayer(Player *player)
@@ -141,6 +140,7 @@
void Trade::reject(Player *player)
{
+ m_rejected = true;
emit rejected(player);
}
Index: trade.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/trade.h,v
retrieving revision 1.11
retrieving revision 1.11.8.1
diff -u -d -r1.11 -r1.11.8.1
--- trade.h 7 Jul 2002 02:35:58 -0000 1.11
+++ trade.h 23 Jun 2003 01:46:36 -0000 1.11.8.1
@@ -105,6 +105,8 @@
QPtrList<Player> players() const;
unsigned int acceptCount();
+
+ bool isRejected() { return m_rejected; }
/**
* select the Trade of the given template type, with the given
@@ -152,7 +154,7 @@
void accept(Trade *trade);
private:
- bool m_changed;
+ bool m_changed, m_rejected;
int m_tradeId;
QPtrList<Player> mPlayers;