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

[Philippe Fremy]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Philippe Fremy <address@hidden> 03/02/27 05:24:43

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

Log message:
        consequence of changing type of MsgDecoder

Patches:
Index: camino/src/server/Player.cpp
diff -u camino/src/server/Player.cpp:1.8 camino/src/server/Player.cpp:1.9
--- camino/src/server/Player.cpp:1.8    Tue Feb 18 13:43:20 2003
+++ camino/src/server/Player.cpp        Thu Feb 27 05:24:43 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: Player.cpp,v 1.8 2003/02/18 18:43:20 pfremy Exp $
+** Version : $Id: Player.cpp,v 1.9 2003/02/27 10:24:43 pfremy Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
@@ -45,8 +45,6 @@
 {
 //    qDebug("Player - slotDecode()");
     // notify server which socket is speaking
-    MsgDecoder::slotDecode();
-
        qDebug( "bytes available : %ld", _socket->bytesAvailable() );
        while( _socket->bytesAvailable() ) { 
                MsgDecoder::slotDecode();
@@ -54,7 +52,7 @@
 }
 
 
-void Player::recvServerConnect( QString playerName )
+void Player::recvPlayerInfo( QString playerName )
 {
        // normally, a client can not connect a server if it has enough players.
        if ( _server->isPlayerNameValid( playerName ) == false ) {
Index: camino/src/server/Player.h
diff -u camino/src/server/Player.h:1.7 camino/src/server/Player.h:1.8
--- camino/src/server/Player.h:1.7      Mon Feb 17 19:11:50 2003
+++ camino/src/server/Player.h  Thu Feb 27 05:24:43 2003
@@ -5,7 +5,7 @@
 ** Player.h
 ** this is a template for all .h files
 **
-** Version : $Id: Player.h,v 1.7 2003/02/18 00:11:50 pfremy Exp $
+** Version : $Id: Player.h,v 1.8 2003/02/27 10:24:43 pfremy Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -46,8 +46,9 @@
 class Tile;
 
 /** comment for the class */
-class Player : public MsgCoder, public MsgDecoder
+class Player : public QObject, public MsgCoder, public MsgDecoder
 {
+    Q_OBJECT
  
 public:
     /** Constructor */
@@ -56,10 +57,11 @@
     void setPlayerName( QString & playerName ) { _playerName = playerName; }
        const QString & getPlayerName() { return _playerName; }
 
-    virtual void slotDecode();
-    virtual void recvServerConnect( QString playerName );
+    virtual void recvPlayerInfo( QString playerName );
        virtual void recvMsg( QString source, QString msg );
 
+public slots:
+    virtual void slotDecode();
 
 protected:
     CaminoServer * _server;