Subversion Repositories QTron

Compare Revisions

Ignore whitespace Rev 5 → Rev 7

/bike.cpp
111,12 → 111,12
socket->write(QString::number(bike->x).toAscii());
socket->write(" ");
socket->write(QString::number(bike->y).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.red()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.green()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.blue()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.red()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.green()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.blue()).toAscii());
socket->write("\n");
}
}
138,7 → 138,7
socket->flush();
 
hadGo = false;
if (!socket->waitForReadyRead(2000))
if (!socket->waitForReadyRead(2000))
{
socket->disconnectFromHost();
dead = true;
232,11 → 232,11
{
colour.setRed(list[1].toInt());
}
else if (list.count() >= 3)
if (list.count() >= 3)
{
colour.setGreen(list[2].toInt());
}
else if (list.count() >= 4)
if (list.count() >= 4)
{
colour.setBlue(list[3].toInt());
}
/bike.h
32,11 → 32,11
int id;
bool isDisconnected;
bool hasHadGo;
QColor colour;
 
private:
QTcpSocket *socket;
float velocity;
QColor colour;
 
private slots:
void readyRead();