Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 12, 2008, 7:40:47 PM (16 years ago)
Author:
scheusso
Message:

merged network branch back to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/network/GamestateManager.h

    r1785 r1907  
    8181    void removeClient(ClientInformation *client);
    8282    private:
    83     void cleanup(); // "garbage handler"
     83//     void cleanup(); // "garbage handler"
    8484    bool processGamestate(packet::Gamestate *gs);
    8585
    86     std::map<int, packet::Gamestate*> gamestateMap; //map gsID to gamestate*
    87     std::map<int, int> gamestateUsed; // save the number of clients, that use the specific gamestate
     86    std::map<unsigned int, std::map<int, packet::Gamestate*> > gamestateMap_;
     87    //std::map<int, packet::Gamestate*> gamestateMap; //map gsID to gamestate*
     88    //std::map<int, int> gamestateUsed; // save the number of clients, that use the specific gamestate
    8889    std::map<int, packet::Gamestate*> gamestateQueue;
    8990    packet::Gamestate *reference;
Note: See TracChangeset for help on using the changeset viewer.