[atlantik-cvs] CVS: kdegames/atlantik/libatlantic atlantic_core.cpp,1.14.4.6,1.14.4.7 atlantic_core.h,1.13.4.6,1.13.4.7
[email protected] Mon, 14 Jul 2003 03:30:13 +0200 (CEST)
Newsgroups
gmane.comp.kde.devel.atlantik
Message-ID
<[email protected] >
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv5342/libatlantic
Modified Files:
Tag: KDE_3_1_BRANCH
atlantic_core.cpp atlantic_core.h
Log Message:
move playerSelf to core, fixes some token issues
Index: atlantic_core.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.cpp,v
retrieving revision 1.14.4.6
retrieving revision 1.14.4.7
diff -u -d -r1.14.4.6 -r1.14.4.7
--- atlantic_core.cpp 17 Jun 2003 19:55:41 -0000 1.14.4.6
+++ atlantic_core.cpp 14 Jul 2003 01:30:11 -0000 1.14.4.7
@@ -24,6 +24,8 @@
AtlanticCore::AtlanticCore(QObject *parent, const char *name) : QObject(parent, name)
{
+ m_playerSelf = 0;
+
connect(this, SIGNAL(deletePlayer(Player *)), this, SLOT(slotDeletePlayer(Player *)));
connect(this, SIGNAL(deleteTrade(Trade *)), this, SLOT(slotDeleteTrade(Trade *)));
}
@@ -49,6 +51,8 @@
m_players.setAutoDelete(true);
m_players.clear();
m_players.setAutoDelete(false);
+
+ m_playerSelf = 0;
}
else
{
@@ -59,6 +63,16 @@
player->setDestination(0);
}
}
+}
+
+void AtlanticCore::setPlayerSelf(Player *player)
+{
+ m_playerSelf = player;
+}
+
+Player *AtlanticCore::playerSelf()
+{
+ return m_playerSelf;
}
QPtrList<Player> AtlanticCore::players()
Index: atlantic_core.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.h,v
retrieving revision 1.13.4.6
retrieving revision 1.13.4.7
diff -u -d -r1.13.4.6 -r1.13.4.7
--- atlantic_core.h 17 Jun 2003 19:55:41 -0000 1.13.4.6
+++ atlantic_core.h 14 Jul 2003 01:30:11 -0000 1.13.4.7
@@ -35,6 +35,9 @@
void reset(bool deletePlayers = false);
+ void setPlayerSelf(Player *player);
+ Player *playerSelf();
+
QPtrList<Player> players();
Player *newPlayer(int playerId);
Player *findPlayer(int playerId);
@@ -69,6 +72,7 @@
void slotDeleteTrade(Trade *trade);
private:
+ Player *m_playerSelf;
QPtrList<Player> m_players;
QPtrList<Estate> m_estates;
QPtrList<EstateGroup> m_estateGroups;