Changeset 1755 for code/trunk/src/network
- Timestamp:
- Sep 10, 2008, 1:37:36 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui (added) merged: 1636,1638,1640-1647,1649-1654,1656,1659-1665,1670,1672-1674,1686,1688-1692,1694-1697,1704 /code/branches/input (added) merged: 1629-1630
- Property svn:mergeinfo changed
-
code/trunk/src/network/ClientConnection.cc
r1747 r1755 42 42 #include <iostream> 43 43 // boost.thread library for multithreading support 44 #include <boost/thread/thread.hpp> 44 45 #include <boost/bind.hpp> 45 46 -
code/trunk/src/network/ClientConnection.h
r1534 r1755 45 45 #include <string> 46 46 #include <enet/enet.h> 47 #include <boost/thread/thread.hpp> 47 #include <boost/thread/recursive_mutex.hpp> 48 #include "PacketBuffer.h" 48 49 49 #include "PacketBuffer.h" 50 namespace boost { class thread; } 50 51 51 52 namespace network -
code/trunk/src/network/ConnectionManager.cc
r1747 r1755 41 41 #include <assert.h> 42 42 // boost.thread library for multithreading support 43 #include <boost/thread/thread.hpp> 43 44 #include <boost/bind.hpp> 44 45 -
code/trunk/src/network/ConnectionManager.h
r1735 r1755 47 47 // enet library for networking support 48 48 #include <enet/enet.h> 49 #include <boost/thread/thread.hpp>50 49 #include <boost/thread/recursive_mutex.hpp> 51 50 52 51 #include "PacketBuffer.h" 53 52 #include "packet/Packet.h" 53 54 namespace boost { class thread; } 54 55 55 56 namespace std -
code/trunk/src/network/GamestateManager.cc
r1751 r1755 44 44 #include <iostream> 45 45 #include <zlib.h> 46 #include < assert.h>46 #include <cassert> 47 47 48 48 #include "core/CoreIncludes.h" -
code/trunk/src/network/Server.cc
r1752 r1755 42 42 43 43 #include <iostream> 44 #include <cassert> 44 45 45 46 … … 339 340 if(!client) 340 341 return false; 341 orxonox::Identifier* id = ID("SpaceShip");342 orxonox::Identifier* id = GetIdentifier("SpaceShip"); 342 343 if(!id){ 343 344 COUT(4) << "We could not create the SpaceShip for client: " << client->getID() << std::endl; -
code/trunk/src/network/Synchronisable.cc
r1751 r1755 101 101 return true; 102 102 103 orxonox::Identifier* id = ID(classID);103 orxonox::Identifier* id = GetIdentifier(classID); 104 104 if(!id){ 105 105 COUT(3) << "We could not identify a new object; classid: " << classID << " uint: " << (unsigned int)classID << " objectID: " << objectID << " size: " << size << std::endl; -
code/trunk/src/network/packet/ClassID.cc
r1735 r1755 73 73 bool ClassID::process(){ 74 74 COUT(3) << "processing classid: " << getClassID() << " name: " << (const char*)(data_+_CLASSNAME) << std::endl; 75 orxonox::Identifier *id= ID( std::string((const char*)(data_+_CLASSNAME) ));75 orxonox::Identifier *id=GetIdentifier( std::string((const char*)(data_+_CLASSNAME) )); 76 76 if(id==NULL) 77 77 return false;
Note: See TracChangeset
for help on using the changeset viewer.