[Camino-devel] camino/src/common MsgCoder.cpp MsgCoder.h MsgDe...

[Philippe Fremy]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Philippe Fremy <address@hidden> 03/02/27 13:21:44

Modified files:
        src/common     : MsgCoder.cpp MsgCoder.h MsgDecoder.cpp 
                         MsgDecoder.h 

Log message:
        add support for more messages

Patches:
Index: camino/src/common/MsgCoder.cpp
diff -u camino/src/common/MsgCoder.cpp:1.12 camino/src/common/MsgCoder.cpp:1.13
--- camino/src/common/MsgCoder.cpp:1.12 Thu Feb 27 12:26:25 2003
+++ camino/src/common/MsgCoder.cpp      Thu Feb 27 13:21:44 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: MsgCoder.cpp,v 1.12 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: MsgCoder.cpp,v 1.13 2003/02/27 18:21:44 pfremy Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
@@ -69,9 +69,9 @@
        device()->flush();
 }
 
-void MsgCoder::sendServerInformation()
+void MsgCoder::sendServerInformation( QString serverInfo )
 {
-       *this << ServerInformation << 0;
+       *this << ServerInformation << 0 << serverInfo ;
        device()->flush();
 }
 void MsgCoder::sendPlayerConnected()
@@ -90,9 +90,9 @@
        device()->flush();
 }
 
-void MsgCoder::sendActivePlayer()
+void MsgCoder::sendActivePlayer( QString playerName )
 {
-       *this << ActivePlayer << 0;
+       *this << ActivePlayer << 0 << playerName;
        device()->flush();
 }
 void MsgCoder::sendPlayerPlaysAMove( Tile * tile )
@@ -107,9 +107,10 @@
        *this << MoveRejected << 0;
        device()->flush();
 }
-void MsgCoder::sendUpdateBoard()
+void MsgCoder::sendUpdateBoard( Tile * tile, bool removeTile )
 {
-       *this << UpdateBoard << 0;
+       *this << UpdateBoard << 0 << (int) removeTile ;
+       sendTile( tile );
        device()->flush();
 }
 
Index: camino/src/common/MsgCoder.h
diff -u camino/src/common/MsgCoder.h:1.12 camino/src/common/MsgCoder.h:1.13
--- camino/src/common/MsgCoder.h:1.12   Thu Feb 27 12:26:25 2003
+++ camino/src/common/MsgCoder.h        Thu Feb 27 13:21:44 2003
@@ -3,7 +3,7 @@
 ** Camino
 **
 **
-** Version : $Id: MsgCoder.h,v 1.12 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: MsgCoder.h,v 1.13 2003/02/27 18:21:44 pfremy Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -110,14 +110,14 @@
        void sendMsg( NetMsgSubtype msgLevel, const QString & source, const 
QString & msg );
        void sendTilesForYou( Tile::TileType tile );
 
-       void sendServerInformation();
+       void sendServerInformation( QString serverInfo );
        void sendPlayerConnected();
        void sendTeamIsBeingChosen();
        void sendTeamsComposition();
-       void sendActivePlayer();
+       void sendActivePlayer( QString playerName );
        void sendPlayerPlaysAMove( Tile * tile );
        void sendMoveRejected();
-       void sendUpdateBoard();
+       void sendUpdateBoard( Tile * tile, bool removeTile = false);
 
        void sendUndoRequest();
        void sendUndoAccepted();
Index: camino/src/common/MsgDecoder.cpp
diff -u camino/src/common/MsgDecoder.cpp:1.10 
camino/src/common/MsgDecoder.cpp:1.11
--- camino/src/common/MsgDecoder.cpp:1.10       Thu Feb 27 12:26:25 2003
+++ camino/src/common/MsgDecoder.cpp    Thu Feb 27 13:21:44 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: MsgDecoder.cpp,v 1.10 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: MsgDecoder.cpp,v 1.11 2003/02/27 18:21:44 pfremy Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 15/01/2003
@@ -77,28 +77,65 @@
                                break;
 
                case ServerInformation:
+                       decodeServerInformation();
+                       break;
                case PlayerConnected:
+                       decodePlayerConnected();
+                       break;
                case TeamIsBeingChosen:
+                       decodeTeamIsBeingChosen();
+                       break;
                case TeamsComposition:
+                       decodeTeamsComposition();
+                       break;
                case ActivePlayer:
+                       decodeActivePlayer();
+                       break;
                case PlayerPlaysAMove:
                                decodePlayerPlaysAMove();
                                break;
-
                case MoveRejected:
+                       decodeMoveRejected();
+                       break;
                case UpdateBoard:
+                       decodeUpdateBoard();
+                       break;
                case UndoAccepted:
+                       decodeUndoAccepted();
+                       break;
                case UndoRejected:
+                       decodeUndoRejected();
+                       break;
                case UndoUpdateBoard:
+                       decodeUndoUpdateBoard();
+                       break;
                case EndOfGameRequest:
+                       decodeEndOfGameRequest();
+                       break;
                case EndOfGameAccepted:
+                       decodeEndOfGameAccepted();
+                       break;
                case EndOfGameRejected:
+                       decodeEndOfGameRejected();
+                       break;
                case PleaseFinishTheBoard:
+                       decodePleaseFinishTheBoard();
+                       break;
                case FinishBoardMove:
+                       decodeFinishBoardMove();
+                       break;
                case BoardsCompleted:
+                       decodeBoardsCompleted();
+                       break;
                case WinnerInformation:
+                       decodeWinnerInformation();
+                       break;
                case AnotherGameRequest:
+                       decodeAnotherGameRequest();
+                       break;
                case AnotherGameAccept:
+                       decodeAnotherGameAccept();
+                       break;
                default:
                        qWarning( "MsgDecoder::slotDecode() - Unknown NetMsg 
type received : %d", _type );
        };
@@ -145,14 +182,16 @@
        qDebug( "MsgDecoder::recvTilesForYou" );
 }
 
-void MsgDecoder::recvServerInformation()
+void MsgDecoder::recvServerInformation( QString serverInfo )
 {
-       qDebug( "MsgDecoder::recvServerInformation()" );
+       qDebug( "MsgDecoder::recvServerInformation() - %s", serverInfo.latin1() 
);
 }
 
 void MsgDecoder::decodeServerInformation()
 {
-       recvServerInformation();
+       QString serverInfo;
+       _ts >> serverInfo;
+       recvServerInformation( serverInfo );
 }
 
 void MsgDecoder::recvPlayerConnected()
@@ -186,14 +225,16 @@
 }
 
 
-void MsgDecoder::recvActivePlayer()
+void MsgDecoder::recvActivePlayer( QString playerName )
 {
-       qDebug( "MsgDecoder::recvActivePlayer()" );
+       qDebug( "MsgDecoder::recvActivePlayer() - %s", playerName.latin1() );
 }
 
 void MsgDecoder::decodeActivePlayer()
 {
-       recvActivePlayer();
+       QString playerName;
+       _ts >> playerName;
+       recvActivePlayer( playerName );
 }
 
 void MsgDecoder::recvPlayerPlaysAMove( Tile * /* tile */ )
@@ -230,14 +271,19 @@
        recvMoveRejected();
 }
 
-void MsgDecoder::recvUpdateBoard()
+void MsgDecoder::recvUpdateBoard( Tile * tile, bool removeTile )
 {
-       qDebug( "MsgDecoder::recvUpdateBoard()" );
+       qDebug( "MsgDecoder::recvUpdateBoard() - %s tile %d at %dx%d ",
+       removeTile ? "remove" : "add", tile->getType(), tile->getRow(), 
tile->getCol() );
 }
 
 void MsgDecoder::decodeUpdateBoard()
 {
-       recvUpdateBoard();
+       int removeTile;
+       Tile * tile;
+       _ts >> removeTile;
+       tile = decodeTile();
+       recvUpdateBoard( tile, (bool) removeTile );
 }
 
 
Index: camino/src/common/MsgDecoder.h
diff -u camino/src/common/MsgDecoder.h:1.12 camino/src/common/MsgDecoder.h:1.13
--- camino/src/common/MsgDecoder.h:1.12 Thu Feb 27 12:26:25 2003
+++ camino/src/common/MsgDecoder.h      Thu Feb 27 13:21:44 2003
@@ -5,7 +5,7 @@
 ** MsgDecoder.h
 ** Decoder for socket msg
 **
-** Version : $Id: MsgDecoder.h,v 1.12 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: MsgDecoder.h,v 1.13 2003/02/27 18:21:44 pfremy Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -57,16 +57,16 @@
        virtual void recvPlayerInfo( QString /* playerName */ ) {}
        virtual void recvMsg( QString /* source */ , QString /* msg */ ) {}
 
-       virtual void recvServerInformation();
+       virtual void recvServerInformation( QString serverInfo );
        virtual void recvPlayerConnected();
        virtual void recvTeamIsBeingChosen();
        virtual void recvTeamsComposition();
 
        virtual void recvTilesForYou( Tile::TileType /* tile */ );
-       virtual void recvActivePlayer();
+       virtual void recvActivePlayer( QString playerName );
        virtual void recvPlayerPlaysAMove( Tile * tile );
        virtual void recvMoveRejected();
-       virtual void recvUpdateBoard();
+       virtual void recvUpdateBoard( Tile * tile, bool removeTile );
 
        virtual void recvUndoRequest();
        virtual void recvUndoAccepted();