Subversion Repositories QTron

Compare Revisions

Ignore whitespace Rev 19 → Rev 15

/bike.h
35,7 → 35,6
bool hasHadGo;
QColor colour;
bool collided;
float abpool;
 
private:
QTcpSocket *socket;
/bike.cpp
16,7 → 16,6
 
velocity = 1;
angle = 0;
abpool = 0;
name = "";
show = false;
isReady = false;
65,6 → 64,7
if (!collided)
{
collided = hasCollided(bikes);
 
if (angle == 0)
{
y -= velocity;
162,7 → 162,7
hasHadGo = true;
}
 
int sign(int x){
int sign(float x){
if(x > 0){
return 1;
}
181,30 → 181,25
return true;
if(linePoints[i].x() < 0 || linePoints[i].x() > 800 || linePoints[i].y() < 0 || linePoints[i].y() > 600)
return true;
int j, r;
int j;
Bike *bike;
for(r = 0; r < bikes.count(); r++)
foreach(bike,bikes)
{
bike = bikes[r];
for(j = 0; j < bike->linePoints.count() - 1; j++)
for(j = 0; j < bike->linePoints.count() - 2; j++)
{
if(!(bike->linePoints[j].x() == bike->linePoints[j+1].x() && linePoints[i].x() == linePoints[i-1].x()) && !(bike->linePoints[j].y() == bike->linePoints[j+1].y() && linePoints[i].y() == linePoints[i-1].y()))
{
 
// If not parallel
if(bike->linePoints[j].x() == bike->linePoints[j+1].x())
{
// x equal
 
if(linePoints[i-1].x() > bike->linePoints[j].x() && linePoints[i].x() < bike->linePoints[j].x() || linePoints[i-1].x() < bike->linePoints[j].x() && linePoints[i].x() > bike->linePoints[j].x())
{
if(linePoints[i-1].x() > bike->linePoints[j].x() && linePoints[i].x() < bike->linePoints[j].x() || linePoints[i-1].x() < bike->linePoints[j].x() && linePoints[i].x() > bike->linePoints[j].x()){
if((sign(linePoints[i-1].y() - bike->linePoints[j].y()) != sign(linePoints[i-1].y() - bike->linePoints[j+1].y())))
return true;
}
}
if(bike->linePoints[j].y() == bike->linePoints[j+1].y())
else if(bike->linePoints[j].y() == bike->linePoints[j+1].y())
{
 
if(linePoints[i-1].y() > bike->linePoints[j].y() && linePoints[i].y() < bike->linePoints[j].y() || linePoints[i-1].y() < bike->linePoints[j].y() && linePoints[i].y() > bike->linePoints[j].y())
{
if((sign(linePoints[i-1].x() - bike->linePoints[j].x()) != sign(linePoints[i-1].x() - bike->linePoints[j+1].x())))
227,7 → 222,6
 
velocity = 1;
angle = 0;
abpool = 0;
show = true;
isReady = true;
hadGo = false;
256,12 → 250,6
{
angle += 360;
}
if(velocity < 5)
velocity += 0.5;
else if(velocity > 5)
velocity -= 0.5;
if(abpool<10)
abpool += 0.2;
hadGo = true;
}
else if (line == "R")
276,38 → 264,20
{
angle += 360;
}
if(velocity < 5)
velocity += 0.5;
else if(velocity > 5)
velocity -= 0.5;
if(abpool<10)
abpool += 0.2;
hadGo = true;
}
else if (line == "A")
{
if(abpool > 0){
velocity += 0.1;
abpool -= 0.5;
}
velocity += 0.1;
hadGo = true;
}
else if (line == "D")
{
if(abpool > 0){
velocity -= 0.2;
abpool -= 0.5;
}
velocity -= 0.2;
hadGo = true;
}
else if (line == "N")
{
if(velocity < 5)
velocity += 0.5;
else if(velocity > 5)
velocity -= 0.5;
if(abpool<10)
abpool += 0.2;
hadGo = true;
}
else if (line.startsWith("NAME "))