[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Camino-devel] camino/src/server CaminoServer.cpp CaminoServer.h
From: |
Pascal Audoux |
Subject: |
[Camino-devel] camino/src/server CaminoServer.cpp CaminoServer.h |
Date: |
Sat, 08 Mar 2003 17:40:38 -0500 |
CVSROOT: /cvsroot/camino
Module name: camino
Changes by: Pascal Audoux <address@hidden> 03/03/08 17:40:38
Modified files:
src/server : CaminoServer.cpp CaminoServer.h
Log message:
bug correction for undo management
Patches:
Index: camino/src/server/CaminoServer.cpp
diff -u camino/src/server/CaminoServer.cpp:1.19
camino/src/server/CaminoServer.cpp:1.20
--- camino/src/server/CaminoServer.cpp:1.19 Sat Mar 8 15:22:00 2003
+++ camino/src/server/CaminoServer.cpp Sat Mar 8 17:40:38 2003
@@ -2,7 +2,7 @@
**
** Camino
**
-** Version : $Id: CaminoServer.cpp,v 1.19 2003/03/08 20:22:00 Audoux Exp $
+** Version : $Id: CaminoServer.cpp,v 1.20 2003/03/08 22:40:38 Audoux Exp $
**
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 19/01/2003
@@ -30,9 +30,11 @@
#include <qsignalmapper.h>
// application specific include files
+#include "common/Board.h"
#include "common/const.h"
#include "common/log.h"
#include "common/TileStack.h"
+
#include "server/Player.h"
@@ -40,6 +42,7 @@
: QServerSocket( port )
{
_tileStack = new TileStack();
+ _board = new Board();
_playerList.setAutoDelete( true );
_playerNb = playerNb;
_state = WaitingForConnection;
@@ -105,6 +108,7 @@
_state = BeginParty;
sortPlayers();
+ _board->init();
_tileStack->init();
distributeTiles();
activateNextPlayer();
@@ -248,6 +252,12 @@
++it;
}
if( ok ) {
+ _board->removeLastPlayedTile();
+ QPtrListIterator<Player> it2( _playerList );
+ while( current = it2.current() ) {
+ current->sendUndoAccepted();
+ ++it2;
+ }
}
} else {
qDebug("CaminoServer::undoAccepted - Not in state
'UndoRequested'" );
@@ -257,7 +267,12 @@
void CaminoServer::undoRejected()
{
-
+ Player * current = 0;
+ QPtrListIterator<Player> it2( _playerList );
+ while( current = it2.current() ) {
+ current->sendUndoRejected();
+ ++it2;
+ }
}
Index: camino/src/server/CaminoServer.h
diff -u camino/src/server/CaminoServer.h:1.15
camino/src/server/CaminoServer.h:1.16
--- camino/src/server/CaminoServer.h:1.15 Sat Mar 8 15:22:00 2003
+++ camino/src/server/CaminoServer.h Sat Mar 8 17:40:38 2003
@@ -5,7 +5,7 @@
** CaminoServer.h
** Server for the game
**
-** Version : $Id: CaminoServer.h,v 1.15 2003/03/08 20:22:00 Audoux Exp $
+** Version : $Id: CaminoServer.h,v 1.16 2003/03/08 22:40:38 Audoux Exp $
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 19/01/2003
** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -38,6 +38,8 @@
#include "server/Player.h"
class QSignalMapper;
+
+class Board;
class Player;
class TileStack;
@@ -103,6 +105,7 @@
protected:
QPtrList<Player> _playerList;
TileStack * _tileStack;
+ Board * _board;
int _playerNb;
int _teamConfiguration;
ServerState _state;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Camino-devel] camino/src/server CaminoServer.cpp CaminoServer.h,
Pascal Audoux <=