From 6c489246677050a3a1b2ab9a44cce0df74482958 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 10 Aug 2007 23:40:38 +0000 Subject: [PATCH] fixed --- src/game.cpp | 2 +- src/game.h | 2 +- src/net/common/serverrecvstate.cpp | 22 +++++++++++----------- src/net/serverrecvstate.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index ffdc88f0..287060ea 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -113,7 +113,7 @@ Game::~Game() delete actualHand; actualHand = 0; -// PlayerInterface *tempPlayer; +// boost::shared_ptr tempPlayer; // for(i=0; i > playerArray; -// PlayerInterface *playerArray[MAX_NUMBER_OF_PLAYERS]; +// boost::shared_ptr playerArray[MAX_NUMBER_OF_PLAYERS]; //Startvariablen int startQuantityPlayers; diff --git a/src/net/common/serverrecvstate.cpp b/src/net/common/serverrecvstate.cpp index d0c17e92..6ff01681 100644 --- a/src/net/common/serverrecvstate.cpp +++ b/src/net/common/serverrecvstate.cpp @@ -547,7 +547,7 @@ ServerRecvStateStartRound::Process(ServerRecvThread &server) { assert(newRound > curRound); // Retrieve active players. If only one player is left, no cards are shown. - std::list activePlayers = GetActivePlayers(curGame); + std::list > activePlayers = GetActivePlayers(curGame); if (curGame.getCurrentHand()->getAllInCondition() && !curGame.getCurrentHand()->getCardsShown() @@ -557,8 +557,8 @@ ServerRecvStateStartRound::Process(ServerRecvThread &server) boost::shared_ptr allIn(new NetPacketAllInShowCards); NetPacketAllInShowCards::Data allInData; - std::list::iterator i = activePlayers.begin(); - std::list::iterator end = activePlayers.end(); + std::list >::iterator i = activePlayers.begin(); + std::list >::iterator end = activePlayers.end(); while (i != end) { @@ -617,13 +617,13 @@ ServerRecvStateStartRound::Process(ServerRecvThread &server) curGame.getCurrentHand()->getCurrentBeRo()->run(); // Retrieve active players. If only one player is left, no cards are shown. - std::list activePlayers = GetActivePlayers(curGame); + std::list > activePlayers = GetActivePlayers(curGame); // if (activePlayers.empty()) TODO throw exception if (activePlayers.size() == 1) { // End of Hand, but keep cards hidden. - PlayerInterface *player = activePlayers.front(); + boost::shared_ptr player = activePlayers.front(); boost::shared_ptr endHand(new NetPacketEndOfHandHideCards); NetPacketEndOfHandHideCards::Data endHandData; endHandData.playerId = player->getMyUniqueID(); @@ -639,8 +639,8 @@ ServerRecvStateStartRound::Process(ServerRecvThread &server) boost::shared_ptr endHand(new NetPacketEndOfHandShowCards); NetPacketEndOfHandShowCards::Data endHandData; - std::list::iterator i = activePlayers.begin(); - std::list::iterator end = activePlayers.end(); + std::list >::iterator i = activePlayers.begin(); + std::list >::iterator end = activePlayers.end(); while (i != end) { @@ -778,7 +778,7 @@ ServerRecvStateWaitPlayerAction::InternalProcess(ServerRecvThread &server, Sessi packet->ToNetPacketPlayersAction()->GetData(actionData); Game &curGame = server.GetGame(); - PlayerInterface *tmpPlayer = curGame.getPlayerByUniqueId(session.playerData->GetUniqueId()); + boost::shared_ptr tmpPlayer = curGame.getPlayerByUniqueId(session.playerData->GetUniqueId()); assert(tmpPlayer); // TODO throw exception // TODO: check whether this is the correct player // TODO: check game state @@ -793,7 +793,7 @@ ServerRecvStateWaitPlayerAction::InternalProcess(ServerRecvThread &server, Sessi } void -ServerRecvStateWaitPlayerAction::PerformPlayerAction(ServerRecvThread &server, PlayerInterface *player, PlayerAction action, int bet) +ServerRecvStateWaitPlayerAction::PerformPlayerAction(ServerRecvThread &server, boost::shared_ptr player, PlayerAction action, int bet) { Game &curGame = server.GetGame(); assert(player); @@ -813,7 +813,7 @@ ServerRecvStateWaitPlayerAction::PerformPlayerAction(ServerRecvThread &server, P } void -ServerRecvStateWaitPlayerAction::SendPlayerAction(ServerRecvThread &server, PlayerInterface *player) +ServerRecvStateWaitPlayerAction::SendPlayerAction(ServerRecvThread &server, boost::shared_ptr player) { Game &curGame = server.GetGame(); assert(player); @@ -980,7 +980,7 @@ ServerRecvStateNextGameDelay::Process(ServerRecvThread &server) { Game &curGame = server.GetGame(); // The game has ended. Notify all clients. - PlayerInterface *winnerPlayer = NULL; + boost::shared_ptr winnerPlayer; for (int i = 0; i < curGame.getStartQuantityPlayers(); i++) { winnerPlayer = curGame.getCurrentHand()->getPlayerArray()[i]; diff --git a/src/net/serverrecvstate.h b/src/net/serverrecvstate.h index 88f5e8b5..37d7a733 100644 --- a/src/net/serverrecvstate.h +++ b/src/net/serverrecvstate.h @@ -206,8 +206,8 @@ protected: virtual int InternalProcess(ServerRecvThread &server, SessionWrapper session, boost::shared_ptr packet); - static void PerformPlayerAction(ServerRecvThread &server, PlayerInterface *player, PlayerAction action, int bet); - static void SendPlayerAction(ServerRecvThread &server, PlayerInterface *player); + static void PerformPlayerAction(ServerRecvThread &server, boost::shared_ptr player, PlayerAction action, int bet); + static void SendPlayerAction(ServerRecvThread &server, boost::shared_ptr player); }; // State: Delay after dealing cards