Changes in / [3d81c0d:67d032c] in network-game


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/Player.cpp

    r3d81c0d r67d032c  
    8888
    8989   // if we're at our target, don't move
    90    if (pos.x == target.x && pos.y == target.y)
    91       cout << "We're already at our target" << endl;
    92    else {
    93       cout << "equals test:" << endl;
    94       float f = 5.0;
    95       int i = 5;
    96 
    97       if (f == i)
    98          cout << "test passed" << endl;
    99       else
    100          cout << "test failed" << endl;
    101 
    102       cout << "Player about to be moved" << endl;
    103       cout << "cur pos x: " << this->pos.x << endl;
    104       cout << "cur pos y: " << this->pos.y << endl;
    105 
     90   if (pos.x != target.x || pos.y != target.y) {
    10691      float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
    107       cout << "We need to move " << pixels << " pixels" << endl;
    10892
    10993      double angle = atan2(target.y-pos.y, target.x-pos.x);
     
    117101         pos.y += sin(angle)*pixels;
    118102      }
    119       cout << "new pos x: " << this->pos.x << endl;
    120       cout << "new pos y: " << this->pos.y << endl;
    121 
    122103   }
    123104
Note: See TracChangeset for help on using the changeset viewer.