Changeset 1752 for code/trunk/src/network
- Timestamp:
- Sep 9, 2008, 8:28:24 PM (16 years ago)
- Location:
- code/trunk/src/network
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/network/Client.cc
r1751 r1752 50 50 { 51 51 // SetConsoleCommandShortcut(Client, chat); 52 53 52 53 54 54 /** 55 55 * Constructor for the Client class … … 92 92 closeConnection(); 93 93 } 94 94 95 95 /** 96 96 * Establish the Connection to the Server … … 121 121 return client_connection.addPacket(packet); 122 122 } 123 123 124 124 bool Client::processChat(packet::Chat *message, unsigned int clientID){ 125 125 return message->process(); 126 126 } 127 127 128 128 /*bool Client::sendChat(packet::Chat *chat){ 129 129 chat->process(); … … 131 131 return p->send(); 132 132 }*/ 133 133 134 134 135 135 /** … … 173 173 if(gameStateID==GAMESTATEID_INITIAL) 174 174 if(gameStateFailure_){ 175 packet::Acknowledgement *ack = new packet::Acknowledgement( GAMESTATEID_INITIAL, 0);175 packet::Acknowledgement *ack = new packet::Acknowledgement((unsigned int)GAMESTATEID_INITIAL, 0); 176 176 if(!ack->send()) 177 177 COUT(3) << "could not (negatively) ack gamestate" << std::endl; 178 else 178 else 179 179 COUT(4) << "negatively acked a gamestate" << std::endl; 180 180 } -
code/trunk/src/network/GamestateClient.h
r1751 r1752 67 67 private: 68 68 packet::Gamestate *processGamestate(packet::Gamestate *gs); 69 void removeObject(orxonox::ObjectList <Synchronisable>::iterator&it);69 void removeObject(orxonox::ObjectListIterator<Synchronisable> &it); 70 70 void printGamestateMap(); 71 71 bool saveShipCache(); -
code/trunk/src/network/Server.cc
r1751 r1752 50 50 #include "objects/SpaceShip.h" 51 51 #include "core/ConsoleCommand.h" 52 #include "core/CoreIncludes.h" 52 53 #include "core/Iterator.h" 53 54 #include "packet/Chat.h" -
code/trunk/src/network/packet/Gamestate.cc
r1751 r1752 30 30 #include "network/ClientInformation.h" 31 31 #include "network/GamestateHandler.h" 32 #include "core/CoreIncludes.h" 32 33 #include "core/Iterator.h" 33 34 … … 267 268 assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->normsize)); 268 269 #endif 269 270 270 271 //copy over the header 271 272 *GAMESTATE_HEADER(ndata) = *HEADER; … … 386 387 return HEADER->compressed; 387 388 } 388 389 389 390 int Gamestate::getBaseID(){ 390 391 return HEADER->base_id; -
code/trunk/src/network/packet/Gamestate.h
r1751 r1752 32 32 #include "util/CRC32.h" 33 33 #endif 34 #include "core/CoreIncludes.h"35 34 36 35 #ifndef NETWORK_PACKETGAMESTATE_H … … 83 82 private: 84 83 unsigned int calcGamestateSize(unsigned int id, int mode=0x0); 85 void removeObject(orxonox::ObjectList <Synchronisable>::iterator&it);84 void removeObject(orxonox::ObjectListIterator<Synchronisable> &it); 86 85 87 86
Note: See TracChangeset
for help on using the changeset viewer.