WebSVN - QTron - Path Comparison - / Rev 34 and / Rev 32

Ignore whitespace Rev 34 → Rev 32

 /bike.h
 ,8 → 9,6
 #include <QHostAddress>
 #include <QThread>
 #include <cmath>
-#include <time.h>
-#include <stdio.h>
 using namespace std;
 ,7 → 19,7
 public:
     Bike(QTcpSocket *sock, int i);
     void draw(QPainter *painter,QList<Bike *> bikes);
-    void run();
+    void run(QList<Bike *> bikes);
     bool hasCollided(QList<Bike *> bikes);
         void setText(QString text);
     void reset();
 ,7 → 35,6
     int id;
     bool isDisconnected;
     bool hasHadGo;
-    QList<Bike *> bikes;
     QColor colour;
     bool collided;
     float abpool;

 /bike.cpp
 ,7 → 103,7
     }
 }
-void Bike::run()
+void Bike::run(QList<Bike *> bikes)
 {
     for (int i = 0; i < bikes.count(); i++)
     {
 ,9 → 163,6
         }
     }
     hasHadGo = true;
-    time_t result = time(NULL);
-    cout << result << ": Recieved next move from " << name.toStdString().c_str() << endl;
 }
 int sign(int x){

 /mainwindow.cpp
 ,7 → 43,7
         {
                 for (int i = 0; i < bikes.count(); i++)
                 {
-                        bikes[i]->speed *= 1.01;
+                        bikes[i]->speed += 0.02;
                 }
         }
 ,14 → 63,12
     if (ready)
     {
-        cout << ":: Sent move request..." << endl;
         for (int i = 0; i < bikes.count(); i++)
         {
             if (bikes[i]->show)
             {
                 bikes[i]->hasHadGo = false;
-                bikes[i]->bikes = bikes;
-                bikes[i]->start();
+                bikes[i]->run(bikes);
             }
         }
         Bike *bike;