Changeset 1907 for code/trunk/src/network/packet/Packet.cc
- Timestamp:
- Oct 12, 2008, 7:40:47 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/network/packet/Packet.cc
r1763 r1907 42 42 #include "Gamestate.h" 43 43 #include "Welcome.h" 44 #include "DeleteObjects.h" 44 45 #include "network/Host.h" 45 46 #include "core/CoreIncludes.h" … … 66 67 } 67 68 68 Packet::Packet(u nsigned char *data,int clientID){69 Packet::Packet(uint8_t *data, unsigned int clientID){ 69 70 flags_ = PACKET_FLAG_DEFAULT; 70 71 packetDirection_ = ENUM::Incoming; … … 74 75 } 75 76 76 /*Packet::Packet(ENetPacket *packet, ENetPeer *peer){77 packetDirection_ = ENUM::Incoming;78 enetPacket_ = packet;79 clientID_ = ClientInformation::findClient(&peer->address)->getID();80 data_ = packet->data;81 }*/82 77 83 78 Packet::Packet(const Packet &p){ … … 87 82 clientID_ = p.clientID_; 88 83 if(p.data_){ 89 data_ = new u nsigned char[p.getSize()];84 data_ = new uint8_t[p.getSize()]; 90 85 memcpy(data_, p.data_, p.getSize()); 91 86 }else … … 125 120 case ENUM::Gamestate: 126 121 case ENUM::Welcome: 122 case ENUM::DeleteObjects: 127 123 break; 128 124 default: … … 138 134 139 135 Packet *Packet::createPacket(ENetPacket *packet, ENetPeer *peer){ 140 u nsigned char*data = packet->data;136 uint8_t *data = packet->data; 141 137 unsigned int clientID = ClientInformation::findClient(&peer->address)->getID(); 142 138 Packet *p; 143 COUT( 3) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;139 COUT(5) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl; 144 140 switch( *(ENUM::Type *)(data + _PACKETID) ) 145 141 { 146 142 case ENUM::Acknowledgement: 147 COUT( 3) << "ack" << std::endl;143 COUT(4) << "ack" << std::endl; 148 144 p = new Acknowledgement( data, clientID ); 149 145 break; 150 146 case ENUM::Chat: 151 COUT( 3) << "chat" << std::endl;147 COUT(4) << "chat" << std::endl; 152 148 p = new Chat( data, clientID ); 153 149 break; 154 150 case ENUM::ClassID: 155 COUT( 3) << "classid" << std::endl;151 COUT(4) << "classid" << std::endl; 156 152 p = new ClassID( data, clientID ); 157 153 break; 158 154 case ENUM::Gamestate: 159 COUT( 3) << "gamestate" << std::endl;155 COUT(4) << "gamestate" << std::endl; 160 156 // TODO: remove brackets 161 157 p = new Gamestate( data, clientID ); 162 158 break; 163 159 case ENUM::Welcome: 164 COUT( 3) << "welcome" << std::endl;160 COUT(4) << "welcome" << std::endl; 165 161 p = new Welcome( data, clientID ); 162 break; 163 case ENUM::DeleteObjects: 164 COUT(4) << "deleteobjects" << std::endl; 165 p = new DeleteObjects( data, clientID ); 166 166 break; 167 167 default:
Note: See TracChangeset
for help on using the changeset viewer.