[atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer designer.cpp,1.47.2.4,1.47.2.5 designer.h,1.17,1.17.2.1

Update of /home/kde/kdeaddons/atlantikdesigner/designer
In directory office:/tmp/cvs-serv32458/designer

Modified Files:
      Tag: KDE_3_1_BRANCH
	designer.cpp designer.h 
Log Message:
backport of more reasonable token/player init

Index: designer.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.cpp,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.5
diff -u -d -r1.47.2.4 -r1.47.2.5
--- designer.cpp	13 Jan 2003 17:58:15 -0000	1.47.2.4
+++ designer.cpp	31 Jan 2003 06:25:11 -0000	1.47.2.5
@@ -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);
-
 	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.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- designer.h	12 Jun 2002 01:31:34 -0000	1.17
+++ designer.h	31 Jan 2003 06:25:11 -0000	1.17.2.1
@@ -69,6 +69,7 @@
 	bool warnClose();
 	void initBoard();
 	void initMembers();
+	void initToken();
 	bool firstBoard;
 	ConfigEstate *newEstate(int);