[Camino-devel] camino/src/server CaminoServer.h CaminoServer.cpp

[Philippe Fremy]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Philippe Fremy <address@hidden> 03/02/18 18:15:44

Modified files:
        src/server     : CaminoServer.h CaminoServer.cpp 

Log message:
        notion de joueur actif

Patches:
Index: camino/src/server/CaminoServer.cpp
diff -u camino/src/server/CaminoServer.cpp:1.10 
camino/src/server/CaminoServer.cpp:1.11
--- camino/src/server/CaminoServer.cpp:1.10     Mon Feb 17 19:11:50 2003
+++ camino/src/server/CaminoServer.cpp  Tue Feb 18 18:15:44 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: CaminoServer.cpp,v 1.10 2003/02/18 00:11:50 pfremy Exp $
+** Version : $Id: CaminoServer.cpp,v 1.11 2003/02/18 23:15:44 pfremy Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 19/01/2003
@@ -41,6 +41,7 @@
        _playerList.setAutoDelete( true );
        _playerNb = playerNb;
        _state = WaitingForConnection;
+       _activePlayer = 0L;
 }
 
 void CaminoServer::newConnection( int numSocket )
@@ -106,7 +107,8 @@
        // check that every player can play with its tiles
        sendDistributedTiles();
        // activate current player
-       // change to playgame
+       _activePlayer = _playerList.first();
+       _state = PlayGame;
 }
 
 void CaminoServer::distributeTiles()
Index: camino/src/server/CaminoServer.h
diff -u camino/src/server/CaminoServer.h:1.8 
camino/src/server/CaminoServer.h:1.9
--- camino/src/server/CaminoServer.h:1.8        Mon Feb 17 19:11:50 2003
+++ camino/src/server/CaminoServer.h    Tue Feb 18 18:15:44 2003
@@ -5,7 +5,7 @@
 ** CaminoServer.h
 ** Server for the game
 **
-** Version : $Id: CaminoServer.h,v 1.8 2003/02/18 00:11:50 pfremy Exp $
+** Version : $Id: CaminoServer.h,v 1.9 2003/02/18 23:15:44 pfremy Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 19/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -97,6 +97,7 @@
        TileStack * _tileStack;
        int _playerNb;
        ServerState _state;
+       Player * _activePlayer;
 
 friend class Player;
 #ifdef DEBUG