jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

phases

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-08-18 16:16:27 +02:00
parent cb90463530
commit 1d400e195d
15 changed files with 507 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

3
servatrice/src/servergame.cpp
View file

@ -108,10 +108,9 @@ void ServerGame::startGameIfReady()
for (int i = 0; i < players.size(); i++)
players.at(i)->setupZones();
activePlayer = 0;
activePhase = 0;
gameStarted = true;
broadcastEvent("game_start", NULL);
setActivePlayer(0);
}
void ServerGame::addPlayer(ServerSocket *player)

14
servatrice/src/serversocket.cpp
View file

@ -212,7 +212,7 @@ const ServerSocket::CommandProperties ServerSocket::commandList[ServerSocket::nu
{"stop_dump_zone", true, true, true, QList<QVariant::Type>() << QVariant::Int
<< QVariant::String, &ServerSocket::cmdStopDumpZone},
{"roll_dice", true, true, true, QList<QVariant::Type>() << QVariant::Int, &ServerSocket::cmdRollDice},
{"set_active_player", true, true, true, QList<QVariant::Type>() << QVariant::Int, &ServerSocket::cmdSetActivePlayer},
{"next_turn", true, true, true, QList<QVariant::Type>(), &ServerSocket::cmdNextTurn},
{"set_active_phase", true, true, true, QList<QVariant::Type>() << QVariant::Int, &ServerSocket::cmdSetActivePhase}
};
@ -603,13 +603,12 @@ ReturnMessage::ReturnCode ServerSocket::cmdRollDice(const QList<QVariant> &param
return ReturnMessage::ReturnOk;
}
ReturnMessage::ReturnCode ServerSocket::cmdSetActivePlayer(const QList<QVariant> &params)
ReturnMessage::ReturnCode ServerSocket::cmdNextTurn(const QList<QVariant> &params)
{
int active_player = params[0].toInt();
if (!game->getPlayer(active_player))
return ReturnMessage::ReturnContextError;
game->setActivePlayer(active_player);
emit broadcastEvent(QString("set_active_player|%1").arg(active_player), this);
int activePlayer = game->getActivePlayer();
if (++activePlayer == game->getPlayerCount())
activePlayer = 0;
game->setActivePlayer(activePlayer);
return ReturnMessage::ReturnOk;
}
@ -620,7 +619,6 @@ ReturnMessage::ReturnCode ServerSocket::cmdSetActivePhase(const QList<QVariant>
if (game->getActivePlayer() != playerId)
return ReturnMessage::ReturnContextError;
game->setActivePhase(active_phase);
emit broadcastEvent(QString("set_active_phase|%1").arg(active_phase), this);
return ReturnMessage::ReturnOk;
}

2
servatrice/src/serversocket.h
View file

@ -83,7 +83,7 @@ private:
ReturnMessage::ReturnCode cmdDumpZone(const QList<QVariant> &params);
ReturnMessage::ReturnCode cmdStopDumpZone(const QList<QVariant> &params);
ReturnMessage::ReturnCode cmdRollDice(const QList<QVariant> &params);
ReturnMessage::ReturnCode cmdSetActivePlayer(const QList<QVariant> &params);
ReturnMessage::ReturnCode cmdNextTurn(const QList<QVariant> &params);
ReturnMessage::ReturnCode cmdSetActivePhase(const QList<QVariant> &params);
Server *server;