[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer designer.cpp,1.51,1.52 designer.h,1.17,1.18
From: kde () office ! kde ! org
Date: 2003-01-31 5:43:05
[Download RAW message or body]
Update of /home/kde/kdeaddons/atlantikdesigner/designer
In directory office:/tmp/cvs-serv27150/designer
Modified Files:
designer.cpp designer.h
Log Message:
more reasonable token/player init
Index: designer.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- designer.cpp 12 Jan 2003 08:18:41 -0000 1.51
+++ designer.cpp 31 Jan 2003 05:43:02 -0000 1.52
@@ -147,6 +147,20 @@
board->show();
editor->show();
+
+ initToken();
+}
+
+void AtlanticDesigner::initToken()
+{
+ if (!m_player)
+ m_player = new Player(0);
+ else
+ m_player->setLocation(0);
+
+ board->addToken(m_player);
+
+ connect(m_player, SIGNAL(changed(Player *)), board, SLOT(playerChanged(Player *)));
}
void AtlanticDesigner::openNew()
@@ -546,11 +560,6 @@
void AtlanticDesigner::setPlayerAtBeginning()
{
- delete m_player;
-
- // our superstar!
- m_player = new Player(0); // playerId 0, we're not going to use it anyway
-
ConfigEstate *go = 0;
for (go = estates.first(); go; go = estates.next())
if (go->go())
@@ -560,8 +569,6 @@
go = estates.first();
movePlayer(go);
- board->addToken(m_player);
-
editor->setEstate(go);
}
Index: designer.h
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- designer.h 12 Jun 2002 01:31:34 -0000 1.17
+++ designer.h 31 Jan 2003 05:43:03 -0000 1.18
@@ -69,6 +69,7 @@
bool warnClose();
void initBoard();
void initMembers();
+ void initToken();
bool firstBoard;
ConfigEstate *newEstate(int);
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic