Subversion Repositories QTron

Compare Revisions

Ignore whitespace Rev 8 → Rev 6

/bike.h
18,8 → 18,7
public:
Bike(QTcpSocket *sock, int i);
void draw(QPainter *painter);
void run(QList<Bike *> bikes);
bool hasCollided();
void run(QList<Bike *> bikes);
void reset();
bool isReady;
bool dead;
32,9 → 31,8
QList<QPoint> linePoints;
int id;
bool isDisconnected;
bool hasHadGo;
QColor colour;
bool collided;
bool hasHadGo;
QColor colour;
 
private:
QTcpSocket *socket;
/bike.cpp
21,7 → 21,6
isReady = false;
hadGo = false;
dead = false;
collided = false;
 
colour.setBlue(0);
colour.setRed(0);
61,31 → 60,22
painter->drawLine(point1, point2);
}
 
if (!collided)
if (angle == 0)
{
collided = hasCollided();
 
if (angle == 0)
{
y -= velocity;
}
else if (angle == 90)
{
x += velocity;
}
else if (angle == 180)
{
y += velocity;
}
else if (angle == 270)
{
x -= velocity;
}
y -= velocity;
}
else
else if (angle == 90)
{
linePoints.clear();
x += velocity;
}
else if (angle == 180)
{
y += velocity;
}
else if (angle == 270)
{
x -= velocity;
}
 
if (angle == 0 || angle == 180)
{
121,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");
}
}
148,7 → 138,7
socket->flush();
 
hadGo = false;
if (!socket->waitForReadyRead(2000))
if (!socket->waitForReadyRead(2000))
{
socket->disconnectFromHost();
dead = true;
162,14 → 152,6
hasHadGo = true;
}
 
bool Bike::hasCollided()
{
// Do collision detection here
// use linePoints
 
return false;
}
 
void Bike::reset()
{
x = rand() % 800;
184,7 → 166,6
isReady = true;
hadGo = false;
dead = false;
collided = false;
 
socket->write("RESET\n");
}
251,11 → 232,11
{
colour.setRed(list[1].toInt());
}
if (list.count() >= 3)
else if (list.count() >= 3)
{
colour.setGreen(list[2].toInt());
}
if (list.count() >= 4)
else if (list.count() >= 4)
{
colour.setBlue(list[3].toInt());
}