- Timestamp:
- Dec 19, 2010, 2:27:06 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network5/src/libraries/network/packet/Gamestate.h
r7758 r7777 42 42 #include "Packet.h" 43 43 44 namespace orxonox { 44 namespace orxonox 45 { 45 46 46 namespace packet { 47 namespace packet 48 { 49 50 static const uint8_t GAMESTATE_MODE_SERVER = 0x1; 51 static const uint8_t GAMESTATE_MODE_CLIENT = 0x2; 47 52 48 class _NetworkExport GamestateHeader{ 53 class _NetworkExport GamestateHeader 54 { 49 55 public: 50 56 GamestateHeader(){ data_=0; } … … 58 64 { return 21; } 59 65 60 inline int32_t getID() const61 { assert(data_); return *( int32_t*)(data_+4); }62 inline void setID( int32_t id)63 { assert(data_); *( int32_t*)(data_+4) = id; }66 inline uint32_t getID() const 67 { assert(data_); return *(uint32_t*)(data_+4); } 68 inline void setID(uint32_t id) 69 { assert(data_); *(uint32_t*)(data_+4) = id; } 64 70 65 inline int32_t getBaseID() const66 { assert(data_); return *( int32_t*)(data_+8); }67 inline void setBaseID( int32_t id)68 { assert(data_); *( int32_t*)(data_+8) = id; }71 inline uint32_t getBaseID() const 72 { assert(data_); return *(uint32_t*)(data_+8); } 73 inline void setBaseID(uint32_t id) 74 { assert(data_); *(uint32_t*)(data_+8) = id; } 69 75 70 76 inline uint32_t getDataSize() const … … 103 109 @author Oliver Scheuss 104 110 */ 105 class _NetworkExport Gamestate: public Packet{ 111 class _NetworkExport Gamestate: public Packet 112 { 106 113 public: 107 114 Gamestate(); … … 114 121 bool collectData(int id, uint8_t mode=0x0); 115 122 bool spreadData( uint8_t mode=0x0); 116 inline int32_t getID() const { return header_.getID(); }123 inline uint32_t getID() const { return header_.getID(); } 117 124 inline bool isDiffed() const { return header_.isDiffed(); } 118 125 inline bool isCompressed() const { return header_.isCompressed(); } … … 132 139 // inline uint32_t findObject( const SynchronisableHeader& header, uint8_t* mem, uint32_t dataLength, uint32_t startPosition = 0 ); 133 140 virtual uint32_t getSize() const; 134 virtual inline bool process();135 uint32_t calcGamestateSize( int32_t id, uint8_t mode=0x0);141 virtual bool process(orxonox::Host* host); 142 uint32_t calcGamestateSize(uint32_t id, uint8_t mode=0x0); 136 143 // inline void diffObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes ); 137 144 // inline void copyObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes );
Note: See TracChangeset
for help on using the changeset viewer.