Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8623 in orxonox.OLD for trunk/src/lib/network/network_stream.h


Ignore:
Timestamp:
Jun 20, 2006, 1:39:01 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/network/network_stream.h

    r8068 r8623  
    8484    void cleanUpOldSyncList();
    8585   
    86     void writeToNewDict( byte * data, int length );
     86    void writeToNewDict( byte * data, int length, bool upstream );
    8787
    8888
    … …  
    107107
    108108    int                        remainingBytesToWriteToDict; //!< if > 0 NetworkStream will write packets to DATA/dicts/newdict
     109
     110    int dictServer;
     111    int dictClient;
    109112};
    110113#endif /* _NETWORK_STREAM */
Note: See TracChangeset for help on using the changeset viewer.