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

unimportant changes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-06-10 21:17:24 +02:00
parent 4054afc759
commit 7f659573bc
21 changed files with 89 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
servatrice/src/serversocket.cpp
View file

@ -27,7 +27,7 @@
#include "playerzone.h"
#include "counter.h"
#include "card.h"
#include "random.h"
#include "abstractrng.h"
ServerSocket::ServerSocket(Server *_server, QObject *parent)
: QTcpSocket(parent), server(_server), game(0), authState(PasswordWrong)
@ -105,7 +105,7 @@ void ServerSocket::setupZones()
int i = 0;
while (DeckIterator.hasNext())
deck->cards.append(new Card(DeckIterator.next(), i++, 0, 0));
deck->shuffle(game->rnd);
deck->shuffle(server->getRNG());
QListIterator<QString> SBIterator(SideboardList);
while (SBIterator.hasNext())
@ -315,7 +315,7 @@ ReturnMessage::ReturnCode ServerSocket::cmdReadyStart(const QList<QVariant> &par
ReturnMessage::ReturnCode ServerSocket::cmdShuffle(const QList<QVariant> &params)
{
Q_UNUSED(params);
getZone("deck")->shuffle(game->rnd);
getZone("deck")->shuffle(server->getRNG());
emit broadcastEvent("shuffle", this);
return ReturnMessage::ReturnOk;
}
@ -367,6 +367,8 @@ ReturnMessage::ReturnCode ServerSocket::cmdMoveCard(const QList<QVariant> &param
if (!card)
return ReturnMessage::ReturnContextError;
int x = params[3].toInt();
if (x == -1)
x = targetzone->cards.size();
int y = 0;
if (targetzone->hasCoords())
y = params[4].toInt();
@ -571,7 +573,7 @@ ReturnMessage::ReturnCode ServerSocket::cmdDumpZone(const QList<QVariant> &param
ReturnMessage::ReturnCode ServerSocket::cmdRollDice(const QList<QVariant> &params)
{
int sides = params[0].toInt();
emit broadcastEvent(QString("roll_dice|%1|%2").arg(sides).arg(game->rnd->getNumber(1, sides)), this);
emit broadcastEvent(QString("roll_dice|%1|%2").arg(sides).arg(server->getRNG()->getNumber(1, sides)), this);
return ReturnMessage::ReturnOk;
}