Changeset 67d032c in network-game for common


Ignore:
Timestamp:
Feb 24, 2013, 5:57:21 PM (12 years ago)
Author:
dportnoy <dmp1488@…>
Branches:
master
Children:
054b50b
Parents:
60940f8 (diff), 3d81c0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:weretaco/network-game

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/Player.cpp

    r60940f8 r67d032c  
    7171   memcpy(&this->target.y, buffer+16, 4);
    7272   this->name.assign(buffer+20);
    73 
    74    cout << "id: " << this->id << endl;
    75    cout << "pos x: " << this->pos.x << endl;
    76    cout << "pos y: " << this->pos.y << endl;
    77    cout << "target x: " << this->target.x << endl;
    78    cout << "target y: " << this->target.y << endl;
    79    cout << "name: " << this->name << endl;
    8073}
    8174
Note: See TracChangeset for help on using the changeset viewer.