Changeset ca44f82 in network-game for common/Player.h


Ignore:
Timestamp:
Feb 24, 2013, 1:28:32 AM (12 years ago)
Author:
dportnoy <dmp1488@…>
Branches:
master
Children:
7b43385
Parents:
3a79253 (diff), 8f85180 (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:

Updated files to correctly compile on Windows

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/Player.h

    r3a79253 rca44f82  
    3232   void setAddr(sockaddr_in addr);
    3333
     34   void move();
     35
    3436   int id;
    3537   string name;
    3638   string password;
    3739   sockaddr_in addr;
    38    PLAYER_POS pos;
     40   FLOAT_POSITION pos;
     41   POSITION target;
     42   unsigned long long timeLastUpdated;
    3943};
    4044
Note: See TracChangeset for help on using the changeset viewer.