Changeset 2211 for code/branches

Timestamp:

Nov 14, 2008, 4:13:06 PM (16 years ago)

Author:

scheusso

Message:

moved some files (Synchronisable, NetworkCallback) to subfolder
synchronisable

Location:

code/branches/network64/src

Files:

• network/CMakeLists.txt (modified) (1 diff)
• network/Client.cc (modified) (1 diff)
• network/ConnectionManager.cc (modified) (1 diff)
• network/GamestateClient.cc (modified) (1 diff)
• network/GamestateManager.cc (modified) (1 diff)
• network/packet/DeleteObjects.cc (modified) (1 diff)
• network/packet/Gamestate.h (modified) (1 diff)
• network/packet/Welcome.cc (modified) (1 diff)
• network/synchronisable (added)
• network/synchronisable/CMakeLists.txt (added)
• network/synchronisable/NetworkCallback.h (moved) (moved from code/branches/network64/src/network/NetworkCallback.h) (1 diff, 1 prop)
• network/synchronisable/Synchronisable.cc (moved) (moved from code/branches/network64/src/network/Synchronisable.cc) (1 diff, 1 prop)
• network/synchronisable/Synchronisable.h (moved) (moved from code/branches/network64/src/network/Synchronisable.h) (1 diff, 1 prop)
• orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• orxonox/objects/Level.h (modified) (1 diff)
• orxonox/objects/Scene.h (modified) (1 diff)
• orxonox/objects/Test.h (modified) (1 diff)
• orxonox/objects/infos/Info.h (modified) (1 diff)
• orxonox/objects/worldentities/WorldEntity.h (modified) (1 diff)

code/branches/network64/src/network/CMakeLists.txt

@@ -11 +11 @@
   PacketBuffer.cc
   Server.cc
-  Synchronisable.cc
   Host.cc
 )
 
 ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES packet)
+ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES synchronisable)
+
 
 IF(WIN32)

code/branches/network64/src/network/Client.cc

@@ -43 +43 @@
 #include "Client.h"
 #include "Host.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
 #include "core/CoreIncludes.h"
 #include "packet/Packet.h"

code/branches/network64/src/network/ConnectionManager.cc

@@ -52 +52 @@
 #include "util/Sleep.h"
 #include "ClientInformation.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
 #include "packet/ClassID.h"
 

code/branches/network64/src/network/GamestateClient.cc

@@ -35 +35 @@
 #include "core/BaseObject.h"
 #include "core/Iterator.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
 #include "packet/Acknowledgement.h"
 

code/branches/network64/src/network/GamestateManager.cc

@@ -49 +49 @@
 #include "core/BaseObject.h"
 #include "ClientInformation.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
 
 namespace orxonox

code/branches/network64/src/network/packet/DeleteObjects.cc

@@ -30 +30 @@
 #include "DeleteObjects.h"
 #include <enet/enet.h>
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/CoreIncludes.h"
 #include <assert.h>

code/branches/network64/src/network/packet/Gamestate.h

@@ -34 +34 @@
 
 #include "Packet.h"
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include <map>
 #ifndef NDEBUG

code/branches/network64/src/network/packet/Welcome.cc

@@ -32 +32 @@
 #include "Welcome.h"
 #include "network/Host.h"
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/CoreIncludes.h"
 #include <assert.h>

code/branches/network64/src/network/synchronisable/NetworkCallback.h

@@ -2 +2 @@
 #define _NETWORK_CALLBACK__
 
-#include "NetworkPrereqs.h"
+#include "network/NetworkPrereqs.h"
 
 namespace orxonox{

code/branches/network64/src/network/synchronisable/Synchronisable.cc

@@ -50 +50 @@
 // #include "core/Identifier.h"
 
-#include "Host.h"
+#include "network/Host.h"
 namespace orxonox
 {

code/branches/network64/src/network/synchronisable/Synchronisable.h

@@ -30 +30 @@
 #define _Synchronisable_H__
 
-#include "NetworkPrereqs.h"
+#include "network/NetworkPrereqs.h"
 
 #include <list>

code/branches/network64/src/orxonox/OrxonoxStableHeaders.h

@@ -95 +95 @@
 #include "core/input/InputManager.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 
 #include "Settings.h"

code/branches/network64/src/orxonox/objects/Level.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/BaseObject.h"
 

code/branches/network64/src/orxonox/objects/Scene.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/BaseObject.h"
 #include "util/Math.h"

code/branches/network64/src/orxonox/objects/Test.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/BaseObject.h"
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 
 namespace orxonox

code/branches/network64/src/orxonox/objects/infos/Info.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/BaseObject.h"
 

code/branches/network64/src/orxonox/objects/worldentities/WorldEntity.h

@@ -36 +36 @@
 #include <OgreSceneNode.h>
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 #include "core/BaseObject.h"
 #include "util/Math.h"