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

minor fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-05-27 02:33:43 +02:00
parent 748d9bb603
commit 13b6a360d2
15 changed files with 58 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cockatrice/src/client.cpp
View file

@ -2,13 +2,12 @@
#include "client.h"
Client::Client(QObject *parent)
: QObject(parent), MsgId(0)
: QObject(parent), status(StatusDisconnected), MsgId(0)
{
timer = new QTimer(this);
timer->setInterval(1000);
connect(timer, SIGNAL(timeout()), this, SLOT(checkTimeout()));
status = StatusDisconnected;
socket = new QTcpSocket(this);
socket->setTextModeEnabled(true);
connect(socket, SIGNAL(connected()), this, SLOT(slotConnected()));
@ -19,7 +18,6 @@ Client::Client(QObject *parent)
Client::~Client()
{
disconnectFromServer();
delete socket;
}
void Client::checkTimeout()
@ -54,11 +52,8 @@ void Client::slotConnected()
void Client::readLine()
{
QString line;
for (;;) {
if (!socket->canReadLine())
break;
line = QString(socket->readLine()).trimmed();
while (socket->canReadLine()) {
QString line = QString(socket->readLine()).trimmed();
if (line.isNull())
break;
@ -67,9 +62,9 @@ void Client::readLine()
QString prefix = values.takeFirst();
// prefix is one of {welcome, private, public, resp, list_games, list_players, list_counters, list_zones, dump_zone}
if (!(prefix.compare("private") && prefix.compare("public"))) {
ServerEventData *event = new ServerEventData(line);
if (event->getEventType() == eventPlayerId) {
QStringList data = event->getEventData();
ServerEventData event(line);
if (event.getEventType() == eventPlayerId) {
QStringList data = event.getEventData();
if (data.size() != 2) {
// XXX
}
@ -78,7 +73,6 @@ void Client::readLine()
if (!ok) {
// XXX
}
delete event;
emit playerIdReceived(id, data[1]);
} else
emit gameEvent(event);